diff options
-rw-r--r-- | include/linux/if_ether.h | 8 | ||||
-rw-r--r-- | include/linux/netdevice.h | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index 7f3c735f422b..0216e1bdbc56 100644 --- a/include/linux/if_ether.h +++ b/include/linux/if_ether.h | |||
@@ -17,7 +17,7 @@ | |||
17 | * as published by the Free Software Foundation; either version | 17 | * as published by the Free Software Foundation; either version |
18 | * 2 of the License, or (at your option) any later version. | 18 | * 2 of the License, or (at your option) any later version. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #ifndef _LINUX_IF_ETHER_H | 21 | #ifndef _LINUX_IF_ETHER_H |
22 | #define _LINUX_IF_ETHER_H | 22 | #define _LINUX_IF_ETHER_H |
23 | 23 | ||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | /* | 26 | /* |
27 | * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble | 27 | * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble |
28 | * and FCS/CRC (frame check sequence). | 28 | * and FCS/CRC (frame check sequence). |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #define ETH_ALEN 6 /* Octets in one ethernet addr */ | 31 | #define ETH_ALEN 6 /* Octets in one ethernet addr */ |
@@ -83,7 +83,7 @@ | |||
83 | /* | 83 | /* |
84 | * Non DIX types. Won't clash for 1500 types. | 84 | * Non DIX types. Won't clash for 1500 types. |
85 | */ | 85 | */ |
86 | 86 | ||
87 | #define ETH_P_802_3 0x0001 /* Dummy type for 802.3 frames */ | 87 | #define ETH_P_802_3 0x0001 /* Dummy type for 802.3 frames */ |
88 | #define ETH_P_AX25 0x0002 /* Dummy protocol id for AX.25 */ | 88 | #define ETH_P_AX25 0x0002 /* Dummy protocol id for AX.25 */ |
89 | #define ETH_P_ALL 0x0003 /* Every packet (be careful!!!) */ | 89 | #define ETH_P_ALL 0x0003 /* Every packet (be careful!!!) */ |
@@ -109,7 +109,7 @@ | |||
109 | /* | 109 | /* |
110 | * This is an Ethernet frame header. | 110 | * This is an Ethernet frame header. |
111 | */ | 111 | */ |
112 | 112 | ||
113 | struct ethhdr { | 113 | struct ethhdr { |
114 | unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ | 114 | unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ |
115 | unsigned char h_source[ETH_ALEN]; /* source ether addr */ | 115 | unsigned char h_source[ETH_ALEN]; /* source ether addr */ |
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 7a5057fbb7cd..864519e585fc 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -96,7 +96,7 @@ struct wireless_dev; | |||
96 | * Compute the worst case header length according to the protocols | 96 | * Compute the worst case header length according to the protocols |
97 | * used. | 97 | * used. |
98 | */ | 98 | */ |
99 | 99 | ||
100 | #if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) | 100 | #if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) |
101 | # if defined(CONFIG_MAC80211_MESH) | 101 | # if defined(CONFIG_MAC80211_MESH) |
102 | # define LL_MAX_HEADER 128 | 102 | # define LL_MAX_HEADER 128 |
@@ -124,7 +124,7 @@ struct wireless_dev; | |||
124 | * Network device statistics. Akin to the 2.0 ether stats but | 124 | * Network device statistics. Akin to the 2.0 ether stats but |
125 | * with byte counters. | 125 | * with byte counters. |
126 | */ | 126 | */ |
127 | 127 | ||
128 | struct net_device_stats | 128 | struct net_device_stats |
129 | { | 129 | { |
130 | unsigned long rx_packets; /* total packets received */ | 130 | unsigned long rx_packets; /* total packets received */ |
@@ -285,7 +285,7 @@ enum netdev_state_t | |||
285 | 285 | ||
286 | /* | 286 | /* |
287 | * This structure holds at boot time configured netdevice settings. They | 287 | * This structure holds at boot time configured netdevice settings. They |
288 | * are then used in the device probing. | 288 | * are then used in the device probing. |
289 | */ | 289 | */ |
290 | struct netdev_boot_setup { | 290 | struct netdev_boot_setup { |
291 | char name[IFNAMSIZ]; | 291 | char name[IFNAMSIZ]; |
@@ -740,7 +740,7 @@ struct net_device | |||
740 | void *dsa_ptr; /* dsa specific data */ | 740 | void *dsa_ptr; /* dsa specific data */ |
741 | #endif | 741 | #endif |
742 | void *atalk_ptr; /* AppleTalk link */ | 742 | void *atalk_ptr; /* AppleTalk link */ |
743 | void *ip_ptr; /* IPv4 specific data */ | 743 | void *ip_ptr; /* IPv4 specific data */ |
744 | void *dn_ptr; /* DECnet specific data */ | 744 | void *dn_ptr; /* DECnet specific data */ |
745 | void *ip6_ptr; /* IPv6 specific data */ | 745 | void *ip6_ptr; /* IPv6 specific data */ |
746 | void *ec_ptr; /* Econet specific data */ | 746 | void *ec_ptr; /* Econet specific data */ |
@@ -753,7 +753,7 @@ struct net_device | |||
753 | */ | 753 | */ |
754 | unsigned long last_rx; /* Time of last Rx */ | 754 | unsigned long last_rx; /* Time of last Rx */ |
755 | /* Interface address info used in eth_type_trans() */ | 755 | /* Interface address info used in eth_type_trans() */ |
756 | unsigned char dev_addr[MAX_ADDR_LEN]; /* hw address, (before bcast | 756 | unsigned char dev_addr[MAX_ADDR_LEN]; /* hw address, (before bcast |
757 | because most packets are unicast) */ | 757 | because most packets are unicast) */ |
758 | 758 | ||
759 | unsigned char broadcast[MAX_ADDR_LEN]; /* hw bcast add */ | 759 | unsigned char broadcast[MAX_ADDR_LEN]; /* hw bcast add */ |