diff options
| author | Dave Jones <davej@tetrachloride.(none)> | 2003-01-08 08:39:06 -0100 |
|---|---|---|
| committer | Dave Jones <davej@tetrachloride.(none)> | 2003-01-08 08:39:06 -0100 |
| commit | d72c8aafbe183a8745419b3e2221d9513c1df3f6 (patch) | |
| tree | 5ca60e8778f6339db0a6025cc713e4d7028aeadb /include/linux | |
| parent | 2c3929fa0a5827140e032d661e43c75c62e5bdd4 (diff) | |
| parent | 9a0a4cb166a73286c4991c212425bc8f3cdc11db (diff) | |
Merge tetrachloride.(none):/mnt/stuff/kernel/2.5/bk-linus
into tetrachloride.(none):/mnt/stuff/kernel/2.5/agpgart
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_arp.h | 1 | ||||
| -rw-r--r-- | include/linux/module.h | 2 | ||||
| -rw-r--r-- | include/linux/netdevice.h | 2 | ||||
| -rw-r--r-- | include/linux/rtnetlink.h | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h index dd936fe6180e..77906e130efd 100644 --- a/include/linux/if_arp.h +++ b/include/linux/if_arp.h @@ -40,6 +40,7 @@ #define ARPHRD_METRICOM 23 /* Metricom STRIP (new IANA id) */ #define ARPHRD_IEEE1394 24 /* IEEE 1394 IPv4 - RFC 2734 */ #define ARPHRD_EUI64 27 /* EUI-64 */ +#define ARPHRD_INFINIBAND 32 /* InfiniBand */ /* Dummy types for non ARP hardware */ #define ARPHRD_SLIP 256 diff --git a/include/linux/module.h b/include/linux/module.h index 54214da9a651..8b0084419604 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -328,7 +328,7 @@ search_module_extables(unsigned long addr) } /* Is this address in a module? */ -static int module_text_address(unsigned long addr) +static inline int module_text_address(unsigned long addr) { return 0; } diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 888d520fd319..2a6e10e6e598 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -66,7 +66,7 @@ struct vlan_group; #endif -#define MAX_ADDR_LEN 8 /* Largest hardware address length */ +#define MAX_ADDR_LEN 32 /* Largest hardware address length */ /* * Compute the worst case header length according to the protocols diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index 57296f48dc02..40ceec333586 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -17,6 +17,7 @@ #define RTM_NEWLINK (RTM_BASE+0) #define RTM_DELLINK (RTM_BASE+1) #define RTM_GETLINK (RTM_BASE+2) +#define RTM_SETLINK (RTM_BASE+3) #define RTM_NEWADDR (RTM_BASE+4) #define RTM_DELADDR (RTM_BASE+5) |