diff options
| author | Ron Yorston <rmy@pobox.com> | 2024-10-08 08:46:53 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2024-10-08 08:47:44 +0100 |
| commit | 2fe27c6dbf3c752edbfddfd48c15bab55b3ab8de (patch) | |
| tree | 3d907c63f92be35ef96dde01fedf6cf6b7a8e14c /networking | |
| parent | 5b30de8fba414f75cb25faebf5cd8f391e1deb75 (diff) | |
| parent | 0929a129fc75c556de67877491281e0bc3ef3edd (diff) | |
| download | busybox-w32-2fe27c6dbf3c752edbfddfd48c15bab55b3ab8de.tar.gz busybox-w32-2fe27c6dbf3c752edbfddfd48c15bab55b3ab8de.tar.bz2 busybox-w32-2fe27c6dbf3c752edbfddfd48c15bab55b3ab8de.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/libiproute/iplink.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c index 37ed114bc..67602a466 100644 --- a/networking/libiproute/iplink.c +++ b/networking/libiproute/iplink.c | |||
| @@ -51,6 +51,27 @@ struct ifla_vlan_flags { | |||
| 51 | }; | 51 | }; |
| 52 | #endif | 52 | #endif |
| 53 | 53 | ||
| 54 | #if ENABLE_FEATURE_IP_LINK_CAN | ||
| 55 | # ifndef CAN_CTRLMODE_ONE_SHOT | ||
| 56 | # define CAN_CTRLMODE_ONE_SHOT 0x08 /* One-Shot mode */ | ||
| 57 | # endif | ||
| 58 | # ifndef CAN_CTRLMODE_BERR_REPORTING | ||
| 59 | # define CAN_CTRLMODE_BERR_REPORTING 0x10 /* Bus-error reporting */ | ||
| 60 | # endif | ||
| 61 | # ifndef CAN_CTRLMODE_FD | ||
| 62 | # define CAN_CTRLMODE_FD 0x20 /* CAN FD mode */ | ||
| 63 | # endif | ||
| 64 | # ifndef CAN_CTRLMODE_PRESUME_ACK | ||
| 65 | # define CAN_CTRLMODE_PRESUME_ACK 0x40 /* Ignore missing CAN ACKs */ | ||
| 66 | # endif | ||
| 67 | # ifndef CAN_CTRLMODE_FD_NON_ISO | ||
| 68 | # define CAN_CTRLMODE_FD_NON_ISO 0x80 /* CAN FD in non-ISO mode */ | ||
| 69 | # endif | ||
| 70 | # ifndef IFLA_CAN_TERMINATION | ||
| 71 | # define IFLA_CAN_TERMINATION 11 | ||
| 72 | # endif | ||
| 73 | #endif | ||
| 74 | |||
| 54 | /* taken from linux/sockios.h */ | 75 | /* taken from linux/sockios.h */ |
| 55 | #define SIOCSIFNAME 0x8923 /* set interface name */ | 76 | #define SIOCSIFNAME 0x8923 /* set interface name */ |
| 56 | 77 | ||