diff options
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index d94cb1431519..2c2ecea28a1b 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -1046,10 +1046,9 @@ struct net_device { | |||
1046 | */ | 1046 | */ |
1047 | char name[IFNAMSIZ]; | 1047 | char name[IFNAMSIZ]; |
1048 | 1048 | ||
1049 | struct pm_qos_request pm_qos_req; | 1049 | /* device name hash chain, please keep it close to name[] */ |
1050 | |||
1051 | /* device name hash chain */ | ||
1052 | struct hlist_node name_hlist; | 1050 | struct hlist_node name_hlist; |
1051 | |||
1053 | /* snmp alias */ | 1052 | /* snmp alias */ |
1054 | char *ifalias; | 1053 | char *ifalias; |
1055 | 1054 | ||
@@ -1322,6 +1321,8 @@ struct net_device { | |||
1322 | 1321 | ||
1323 | /* group the device belongs to */ | 1322 | /* group the device belongs to */ |
1324 | int group; | 1323 | int group; |
1324 | |||
1325 | struct pm_qos_request pm_qos_req; | ||
1325 | }; | 1326 | }; |
1326 | #define to_net_dev(d) container_of(d, struct net_device, dev) | 1327 | #define to_net_dev(d) container_of(d, struct net_device, dev) |
1327 | 1328 | ||
@@ -1626,6 +1627,7 @@ extern int dev_alloc_name(struct net_device *dev, const char *name); | |||
1626 | extern int dev_open(struct net_device *dev); | 1627 | extern int dev_open(struct net_device *dev); |
1627 | extern int dev_close(struct net_device *dev); | 1628 | extern int dev_close(struct net_device *dev); |
1628 | extern void dev_disable_lro(struct net_device *dev); | 1629 | extern void dev_disable_lro(struct net_device *dev); |
1630 | extern int dev_loopback_xmit(struct sk_buff *newskb); | ||
1629 | extern int dev_queue_xmit(struct sk_buff *skb); | 1631 | extern int dev_queue_xmit(struct sk_buff *skb); |
1630 | extern int register_netdevice(struct net_device *dev); | 1632 | extern int register_netdevice(struct net_device *dev); |
1631 | extern void unregister_netdevice_queue(struct net_device *dev, | 1633 | extern void unregister_netdevice_queue(struct net_device *dev, |