diff --git a/[refs] b/[refs] index 9e045894d116..3e98bdae7fcb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67da25521066b38911701efa133aaad2238b5530 +refs/heads/master: 9136461ab921fd5066ba6a0de08399e2172f4d71 diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index d94cb1431519..a0b84e3b087c 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -1046,10 +1046,9 @@ struct net_device { */ char name[IFNAMSIZ]; - struct pm_qos_request pm_qos_req; - - /* device name hash chain */ + /* device name hash chain, please keep it close to name[] */ struct hlist_node name_hlist; + /* snmp alias */ char *ifalias; @@ -1322,6 +1321,8 @@ struct net_device { /* group the device belongs to */ int group; + + struct pm_qos_request pm_qos_req; }; #define to_net_dev(d) container_of(d, struct net_device, dev)