diff options
author | Patrick McHardy <kaber@trash.net> | 2010-06-15 11:31:06 -0400 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2010-06-15 11:31:06 -0400 |
commit | f9181f4ffc71d7b7dd1906c9a11d51d6659220ae (patch) | |
tree | 194f22e8216a1b9ee2c0dd019142202d73a7dc87 /include/linux | |
parent | 0902b469bd25065aa0688c3cee6f11744c817e7c (diff) | |
parent | 1ab6c163dee279559e3a62d774af7e4c4c9b4c67 (diff) |
Merge branch 'master' of /repos/git/net-next-2.6
Conflicts:
include/net/netfilter/xt_rateest.h
net/bridge/br_netfilter.c
net/netfilter/nf_conntrack_core.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/ethtool.h | 40 | ||||
-rw-r--r-- | include/linux/if_bonding.h | 1 | ||||
-rw-r--r-- | include/linux/if_bridge.h | 2 | ||||
-rw-r--r-- | include/linux/if_ether.h | 2 | ||||
-rw-r--r-- | include/linux/if_fddi.h | 8 | ||||
-rw-r--r-- | include/linux/if_frad.h | 2 | ||||
-rw-r--r-- | include/linux/if_hippi.h | 8 | ||||
-rw-r--r-- | include/linux/if_link.h | 3 | ||||
-rw-r--r-- | include/linux/if_macvlan.h | 4 | ||||
-rw-r--r-- | include/linux/if_packet.h | 1 | ||||
-rw-r--r-- | include/linux/if_pppox.h | 8 | ||||
-rw-r--r-- | include/linux/ipv6.h | 4 | ||||
-rw-r--r-- | include/linux/isdnif.h | 2 | ||||
-rw-r--r-- | include/linux/mISDNif.h | 2 | ||||
-rw-r--r-- | include/linux/nbd.h | 2 | ||||
-rw-r--r-- | include/linux/ncp.h | 10 | ||||
-rw-r--r-- | include/linux/ncp_fs_sb.h | 14 | ||||
-rw-r--r-- | include/linux/netdevice.h | 108 | ||||
-rw-r--r-- | include/linux/netfilter/x_tables.h | 2 | ||||
-rw-r--r-- | include/linux/nl80211.h | 2 | ||||
-rw-r--r-- | include/linux/phonet.h | 4 | ||||
-rw-r--r-- | include/linux/rds.h | 12 | ||||
-rw-r--r-- | include/linux/sctp.h | 80 | ||||
-rw-r--r-- | include/linux/skbuff.h | 8 | ||||
-rw-r--r-- | include/linux/snmp.h | 1 | ||||
-rw-r--r-- | include/linux/ssb/ssb.h | 159 | ||||
-rw-r--r-- | include/linux/wlp.h | 22 |
27 files changed, 188 insertions, 323 deletions
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index 276b40a16835..2c8af093d8b3 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h | |||
@@ -586,29 +586,29 @@ struct ethtool_ops { | |||
586 | #define ETHTOOL_GREGS 0x00000004 /* Get NIC registers. */ | 586 | #define ETHTOOL_GREGS 0x00000004 /* Get NIC registers. */ |
587 | #define ETHTOOL_GWOL 0x00000005 /* Get wake-on-lan options. */ | 587 | #define ETHTOOL_GWOL 0x00000005 /* Get wake-on-lan options. */ |
588 | #define ETHTOOL_SWOL 0x00000006 /* Set wake-on-lan options. */ | 588 | #define ETHTOOL_SWOL 0x00000006 /* Set wake-on-lan options. */ |
589 | #define ETHTOOL_GMSGLVL 0x00000007 /* Get driver message level */ | 589 | #define ETHTOOL_GMSGLVL 0x00000007 /* Get driver message level */ |
590 | #define ETHTOOL_SMSGLVL 0x00000008 /* Set driver msg level. */ | 590 | #define ETHTOOL_SMSGLVL 0x00000008 /* Set driver msg level. */ |
591 | #define ETHTOOL_NWAY_RST 0x00000009 /* Restart autonegotiation. */ | 591 | #define ETHTOOL_NWAY_RST 0x00000009 /* Restart autonegotiation. */ |
592 | #define ETHTOOL_GLINK 0x0000000a /* Get link status (ethtool_value) */ | 592 | #define ETHTOOL_GLINK 0x0000000a /* Get link status (ethtool_value) */ |
593 | #define ETHTOOL_GEEPROM 0x0000000b /* Get EEPROM data */ | 593 | #define ETHTOOL_GEEPROM 0x0000000b /* Get EEPROM data */ |
594 | #define ETHTOOL_SEEPROM 0x0000000c /* Set EEPROM data. */ | 594 | #define ETHTOOL_SEEPROM 0x0000000c /* Set EEPROM data. */ |
595 | #define ETHTOOL_GCOALESCE 0x0000000e /* Get coalesce config */ | 595 | #define ETHTOOL_GCOALESCE 0x0000000e /* Get coalesce config */ |
596 | #define ETHTOOL_SCOALESCE 0x0000000f /* Set coalesce config. */ | 596 | #define ETHTOOL_SCOALESCE 0x0000000f /* Set coalesce config. */ |
597 | #define ETHTOOL_GRINGPARAM 0x00000010 /* Get ring parameters */ | 597 | #define ETHTOOL_GRINGPARAM 0x00000010 /* Get ring parameters */ |
598 | #define ETHTOOL_SRINGPARAM 0x00000011 /* Set ring parameters. */ | 598 | #define ETHTOOL_SRINGPARAM 0x00000011 /* Set ring parameters. */ |
599 | #define ETHTOOL_GPAUSEPARAM 0x00000012 /* Get pause parameters */ | 599 | #define ETHTOOL_GPAUSEPARAM 0x00000012 /* Get pause parameters */ |
600 | #define ETHTOOL_SPAUSEPARAM 0x00000013 /* Set pause parameters. */ | 600 | #define ETHTOOL_SPAUSEPARAM 0x00000013 /* Set pause parameters. */ |
601 | #define ETHTOOL_GRXCSUM 0x00000014 /* Get RX hw csum enable (ethtool_value) */ | 601 | #define ETHTOOL_GRXCSUM 0x00000014 /* Get RX hw csum enable (ethtool_value) */ |
602 | #define ETHTOOL_SRXCSUM 0x00000015 /* Set RX hw csum enable (ethtool_value) */ | 602 | #define ETHTOOL_SRXCSUM 0x00000015 /* Set RX hw csum enable (ethtool_value) */ |
603 | #define ETHTOOL_GTXCSUM 0x00000016 /* Get TX hw csum enable (ethtool_value) */ | 603 | #define ETHTOOL_GTXCSUM 0x00000016 /* Get TX hw csum enable (ethtool_value) */ |
604 | #define ETHTOOL_STXCSUM 0x00000017 /* Set TX hw csum enable (ethtool_value) */ | 604 | #define ETHTOOL_STXCSUM 0x00000017 /* Set TX hw csum enable (ethtool_value) */ |
605 | #define ETHTOOL_GSG 0x00000018 /* Get scatter-gather enable | 605 | #define ETHTOOL_GSG 0x00000018 /* Get scatter-gather enable |
606 | * (ethtool_value) */ | 606 | * (ethtool_value) */ |
607 | #define ETHTOOL_SSG 0x00000019 /* Set scatter-gather enable | 607 | #define ETHTOOL_SSG 0x00000019 /* Set scatter-gather enable |
608 | * (ethtool_value). */ | 608 | * (ethtool_value). */ |
609 | #define ETHTOOL_TEST 0x0000001a /* execute NIC self-test. */ | 609 | #define ETHTOOL_TEST 0x0000001a /* execute NIC self-test. */ |
610 | #define ETHTOOL_GSTRINGS 0x0000001b /* get specified string set */ | 610 | #define ETHTOOL_GSTRINGS 0x0000001b /* get specified string set */ |
611 | #define ETHTOOL_PHYS_ID 0x0000001c /* identify the NIC */ | 611 | #define ETHTOOL_PHYS_ID 0x0000001c /* identify the NIC */ |
612 | #define ETHTOOL_GSTATS 0x0000001d /* get NIC-specific statistics */ | 612 | #define ETHTOOL_GSTATS 0x0000001d /* get NIC-specific statistics */ |
613 | #define ETHTOOL_GTSO 0x0000001e /* Get TSO enable (ethtool_value) */ | 613 | #define ETHTOOL_GTSO 0x0000001e /* Get TSO enable (ethtool_value) */ |
614 | #define ETHTOOL_STSO 0x0000001f /* Set TSO enable (ethtool_value) */ | 614 | #define ETHTOOL_STSO 0x0000001f /* Set TSO enable (ethtool_value) */ |
@@ -619,8 +619,8 @@ struct ethtool_ops { | |||
619 | #define ETHTOOL_SGSO 0x00000024 /* Set GSO enable (ethtool_value) */ | 619 | #define ETHTOOL_SGSO 0x00000024 /* Set GSO enable (ethtool_value) */ |
620 | #define ETHTOOL_GFLAGS 0x00000025 /* Get flags bitmap(ethtool_value) */ | 620 | #define ETHTOOL_GFLAGS 0x00000025 /* Get flags bitmap(ethtool_value) */ |
621 | #define ETHTOOL_SFLAGS 0x00000026 /* Set flags bitmap(ethtool_value) */ | 621 | #define ETHTOOL_SFLAGS 0x00000026 /* Set flags bitmap(ethtool_value) */ |
622 | #define ETHTOOL_GPFLAGS 0x00000027 /* Get driver-private flags bitmap */ | 622 | #define ETHTOOL_GPFLAGS 0x00000027 /* Get driver-private flags bitmap */ |
623 | #define ETHTOOL_SPFLAGS 0x00000028 /* Set driver-private flags bitmap */ | 623 | #define ETHTOOL_SPFLAGS 0x00000028 /* Set driver-private flags bitmap */ |
624 | 624 | ||
625 | #define ETHTOOL_GRXFH 0x00000029 /* Get RX flow hash configuration */ | 625 | #define ETHTOOL_GRXFH 0x00000029 /* Get RX flow hash configuration */ |
626 | #define ETHTOOL_SRXFH 0x0000002a /* Set RX flow hash configuration */ | 626 | #define ETHTOOL_SRXFH 0x0000002a /* Set RX flow hash configuration */ |
@@ -645,18 +645,18 @@ struct ethtool_ops { | |||
645 | /* Indicates what features are supported by the interface. */ | 645 | /* Indicates what features are supported by the interface. */ |
646 | #define SUPPORTED_10baseT_Half (1 << 0) | 646 | #define SUPPORTED_10baseT_Half (1 << 0) |
647 | #define SUPPORTED_10baseT_Full (1 << 1) | 647 | #define SUPPORTED_10baseT_Full (1 << 1) |
648 | #define SUPPORTED_100baseT_Half (1 << 2) | 648 | #define SUPPORTED_100baseT_Half (1 << 2) |
649 | #define SUPPORTED_100baseT_Full (1 << 3) | 649 | #define SUPPORTED_100baseT_Full (1 << 3) |
650 | #define SUPPORTED_1000baseT_Half (1 << 4) | 650 | #define SUPPORTED_1000baseT_Half (1 << 4) |
651 | #define SUPPORTED_1000baseT_Full (1 << 5) | 651 | #define SUPPORTED_1000baseT_Full (1 << 5) |
652 | #define SUPPORTED_Autoneg (1 << 6) | 652 | #define SUPPORTED_Autoneg (1 << 6) |
653 | #define SUPPORTED_TP (1 << 7) | 653 | #define SUPPORTED_TP (1 << 7) |
654 | #define SUPPORTED_AUI (1 << 8) | 654 | #define SUPPORTED_AUI (1 << 8) |
655 | #define SUPPORTED_MII (1 << 9) | 655 | #define SUPPORTED_MII (1 << 9) |
656 | #define SUPPORTED_FIBRE (1 << 10) | 656 | #define SUPPORTED_FIBRE (1 << 10) |
657 | #define SUPPORTED_BNC (1 << 11) | 657 | #define SUPPORTED_BNC (1 << 11) |
658 | #define SUPPORTED_10000baseT_Full (1 << 12) | 658 | #define SUPPORTED_10000baseT_Full (1 << 12) |
659 | #define SUPPORTED_Pause (1 << 13) | 659 | #define SUPPORTED_Pause (1 << 13) |
660 | #define SUPPORTED_Asym_Pause (1 << 14) | 660 | #define SUPPORTED_Asym_Pause (1 << 14) |
661 | #define SUPPORTED_2500baseX_Full (1 << 15) | 661 | #define SUPPORTED_2500baseX_Full (1 << 15) |
662 | #define SUPPORTED_Backplane (1 << 16) | 662 | #define SUPPORTED_Backplane (1 << 16) |
@@ -666,8 +666,8 @@ struct ethtool_ops { | |||
666 | #define SUPPORTED_10000baseR_FEC (1 << 20) | 666 | #define SUPPORTED_10000baseR_FEC (1 << 20) |
667 | 667 | ||
668 | /* Indicates what features are advertised by the interface. */ | 668 | /* Indicates what features are advertised by the interface. */ |
669 | #define ADVERTISED_10baseT_Half (1 << 0) | 669 | #define ADVERTISED_10baseT_Half (1 << 0) |
670 | #define ADVERTISED_10baseT_Full (1 << 1) | 670 | #define ADVERTISED_10baseT_Full (1 << 1) |
671 | #define ADVERTISED_100baseT_Half (1 << 2) | 671 | #define ADVERTISED_100baseT_Half (1 << 2) |
672 | #define ADVERTISED_100baseT_Full (1 << 3) | 672 | #define ADVERTISED_100baseT_Full (1 << 3) |
673 | #define ADVERTISED_1000baseT_Half (1 << 4) | 673 | #define ADVERTISED_1000baseT_Half (1 << 4) |
@@ -706,12 +706,12 @@ struct ethtool_ops { | |||
706 | #define DUPLEX_FULL 0x01 | 706 | #define DUPLEX_FULL 0x01 |
707 | 707 | ||
708 | /* Which connector port. */ | 708 | /* Which connector port. */ |
709 | #define PORT_TP 0x00 | 709 | #define PORT_TP 0x00 |
710 | #define PORT_AUI 0x01 | 710 | #define PORT_AUI 0x01 |
711 | #define PORT_MII 0x02 | 711 | #define PORT_MII 0x02 |
712 | #define PORT_FIBRE 0x03 | 712 | #define PORT_FIBRE 0x03 |
713 | #define PORT_BNC 0x04 | 713 | #define PORT_BNC 0x04 |
714 | #define PORT_DA 0x05 | 714 | #define PORT_DA 0x05 |
715 | #define PORT_NONE 0xef | 715 | #define PORT_NONE 0xef |
716 | #define PORT_OTHER 0xff | 716 | #define PORT_OTHER 0xff |
717 | 717 | ||
@@ -725,7 +725,7 @@ struct ethtool_ops { | |||
725 | /* Enable or disable autonegotiation. If this is set to enable, | 725 | /* Enable or disable autonegotiation. If this is set to enable, |
726 | * the forced link modes above are completely ignored. | 726 | * the forced link modes above are completely ignored. |
727 | */ | 727 | */ |
728 | #define AUTONEG_DISABLE 0x00 | 728 | #define AUTONEG_DISABLE 0x00 |
729 | #define AUTONEG_ENABLE 0x01 | 729 | #define AUTONEG_ENABLE 0x01 |
730 | 730 | ||
731 | /* Mode MDI or MDI-X */ | 731 | /* Mode MDI or MDI-X */ |
diff --git a/include/linux/if_bonding.h b/include/linux/if_bonding.h index cd525fae3c98..2c7994372bde 100644 --- a/include/linux/if_bonding.h +++ b/include/linux/if_bonding.h | |||
@@ -83,6 +83,7 @@ | |||
83 | 83 | ||
84 | #define BOND_DEFAULT_MAX_BONDS 1 /* Default maximum number of devices to support */ | 84 | #define BOND_DEFAULT_MAX_BONDS 1 /* Default maximum number of devices to support */ |
85 | 85 | ||
86 | #define BOND_DEFAULT_TX_QUEUES 16 /* Default number of tx queues per device */ | ||
86 | /* hashing types */ | 87 | /* hashing types */ |
87 | #define BOND_XMIT_POLICY_LAYER2 0 /* layer 2 (MAC only), default */ | 88 | #define BOND_XMIT_POLICY_LAYER2 0 /* layer 2 (MAC only), default */ |
88 | #define BOND_XMIT_POLICY_LAYER34 1 /* layer 3+4 (IP ^ (TCP || UDP)) */ | 89 | #define BOND_XMIT_POLICY_LAYER34 1 /* layer 3+4 (IP ^ (TCP || UDP)) */ |
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index 938b7e81df95..0d241a5c4909 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h | |||
@@ -102,8 +102,6 @@ struct __fdb_entry { | |||
102 | #include <linux/netdevice.h> | 102 | #include <linux/netdevice.h> |
103 | 103 | ||
104 | extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *)); | 104 | extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *)); |
105 | extern struct sk_buff *(*br_handle_frame_hook)(struct net_bridge_port *p, | ||
106 | struct sk_buff *skb); | ||
107 | extern int (*br_should_route_hook)(struct sk_buff *skb); | 105 | extern int (*br_should_route_hook)(struct sk_buff *skb); |
108 | 106 | ||
109 | #endif | 107 | #endif |
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index bed7a4682b90..c831467774d0 100644 --- a/include/linux/if_ether.h +++ b/include/linux/if_ether.h | |||
@@ -119,7 +119,7 @@ struct ethhdr { | |||
119 | unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ | 119 | unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ |
120 | unsigned char h_source[ETH_ALEN]; /* source ether addr */ | 120 | unsigned char h_source[ETH_ALEN]; /* source ether addr */ |
121 | __be16 h_proto; /* packet type ID field */ | 121 | __be16 h_proto; /* packet type ID field */ |
122 | } __attribute__((packed)); | 122 | } __packed; |
123 | 123 | ||
124 | #ifdef __KERNEL__ | 124 | #ifdef __KERNEL__ |
125 | #include <linux/skbuff.h> | 125 | #include <linux/skbuff.h> |
diff --git a/include/linux/if_fddi.h b/include/linux/if_fddi.h index 5459c5c09930..9947c39e62f6 100644 --- a/include/linux/if_fddi.h +++ b/include/linux/if_fddi.h | |||
@@ -67,7 +67,7 @@ struct fddi_8022_1_hdr { | |||
67 | __u8 dsap; /* destination service access point */ | 67 | __u8 dsap; /* destination service access point */ |
68 | __u8 ssap; /* source service access point */ | 68 | __u8 ssap; /* source service access point */ |
69 | __u8 ctrl; /* control byte #1 */ | 69 | __u8 ctrl; /* control byte #1 */ |
70 | } __attribute__ ((packed)); | 70 | } __packed; |
71 | 71 | ||
72 | /* Define 802.2 Type 2 header */ | 72 | /* Define 802.2 Type 2 header */ |
73 | struct fddi_8022_2_hdr { | 73 | struct fddi_8022_2_hdr { |
@@ -75,7 +75,7 @@ struct fddi_8022_2_hdr { | |||
75 | __u8 ssap; /* source service access point */ | 75 | __u8 ssap; /* source service access point */ |
76 | __u8 ctrl_1; /* control byte #1 */ | 76 | __u8 ctrl_1; /* control byte #1 */ |
77 | __u8 ctrl_2; /* control byte #2 */ | 77 | __u8 ctrl_2; /* control byte #2 */ |
78 | } __attribute__ ((packed)); | 78 | } __packed; |
79 | 79 | ||
80 | /* Define 802.2 SNAP header */ | 80 | /* Define 802.2 SNAP header */ |
81 | #define FDDI_K_OUI_LEN 3 | 81 | #define FDDI_K_OUI_LEN 3 |
@@ -85,7 +85,7 @@ struct fddi_snap_hdr { | |||
85 | __u8 ctrl; /* always 0x03 */ | 85 | __u8 ctrl; /* always 0x03 */ |
86 | __u8 oui[FDDI_K_OUI_LEN]; /* organizational universal id */ | 86 | __u8 oui[FDDI_K_OUI_LEN]; /* organizational universal id */ |
87 | __be16 ethertype; /* packet type ID field */ | 87 | __be16 ethertype; /* packet type ID field */ |
88 | } __attribute__ ((packed)); | 88 | } __packed; |
89 | 89 | ||
90 | /* Define FDDI LLC frame header */ | 90 | /* Define FDDI LLC frame header */ |
91 | struct fddihdr { | 91 | struct fddihdr { |
@@ -98,7 +98,7 @@ struct fddihdr { | |||
98 | struct fddi_8022_2_hdr llc_8022_2; | 98 | struct fddi_8022_2_hdr llc_8022_2; |
99 | struct fddi_snap_hdr llc_snap; | 99 | struct fddi_snap_hdr llc_snap; |
100 | } hdr; | 100 | } hdr; |
101 | } __attribute__ ((packed)); | 101 | } __packed; |
102 | 102 | ||
103 | #ifdef __KERNEL__ | 103 | #ifdef __KERNEL__ |
104 | #include <linux/netdevice.h> | 104 | #include <linux/netdevice.h> |
diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h index 80b3a1056a5f..191ee0869bc1 100644 --- a/include/linux/if_frad.h +++ b/include/linux/if_frad.h | |||
@@ -135,7 +135,7 @@ struct frhdr | |||
135 | __be16 PID; | 135 | __be16 PID; |
136 | 136 | ||
137 | #define IP_NLPID pad | 137 | #define IP_NLPID pad |
138 | } __attribute__((packed)); | 138 | } __packed; |
139 | 139 | ||
140 | /* see RFC 1490 for the definition of the following */ | 140 | /* see RFC 1490 for the definition of the following */ |
141 | #define FRAD_I_UI 0x03 | 141 | #define FRAD_I_UI 0x03 |
diff --git a/include/linux/if_hippi.h b/include/linux/if_hippi.h index 8d038eb8db5c..5fe5f307c6f5 100644 --- a/include/linux/if_hippi.h +++ b/include/linux/if_hippi.h | |||
@@ -104,7 +104,7 @@ struct hippi_fp_hdr { | |||
104 | __be32 fixed; | 104 | __be32 fixed; |
105 | #endif | 105 | #endif |
106 | __be32 d2_size; | 106 | __be32 d2_size; |
107 | } __attribute__ ((packed)); | 107 | } __packed; |
108 | 108 | ||
109 | struct hippi_le_hdr { | 109 | struct hippi_le_hdr { |
110 | #if defined (__BIG_ENDIAN_BITFIELD) | 110 | #if defined (__BIG_ENDIAN_BITFIELD) |
@@ -129,7 +129,7 @@ struct hippi_le_hdr { | |||
129 | __u8 daddr[HIPPI_ALEN]; | 129 | __u8 daddr[HIPPI_ALEN]; |
130 | __u16 locally_administered; | 130 | __u16 locally_administered; |
131 | __u8 saddr[HIPPI_ALEN]; | 131 | __u8 saddr[HIPPI_ALEN]; |
132 | } __attribute__ ((packed)); | 132 | } __packed; |
133 | 133 | ||
134 | #define HIPPI_OUI_LEN 3 | 134 | #define HIPPI_OUI_LEN 3 |
135 | /* | 135 | /* |
@@ -142,12 +142,12 @@ struct hippi_snap_hdr { | |||
142 | __u8 ctrl; /* always 0x03 */ | 142 | __u8 ctrl; /* always 0x03 */ |
143 | __u8 oui[HIPPI_OUI_LEN]; /* organizational universal id (zero)*/ | 143 | __u8 oui[HIPPI_OUI_LEN]; /* organizational universal id (zero)*/ |
144 | __be16 ethertype; /* packet type ID field */ | 144 | __be16 ethertype; /* packet type ID field */ |
145 | } __attribute__ ((packed)); | 145 | } __packed; |
146 | 146 | ||
147 | struct hippi_hdr { | 147 | struct hippi_hdr { |
148 | struct hippi_fp_hdr fp; | 148 | struct hippi_fp_hdr fp; |
149 | struct hippi_le_hdr le; | 149 | struct hippi_le_hdr le; |
150 | struct hippi_snap_hdr snap; | 150 | struct hippi_snap_hdr snap; |
151 | } __attribute__ ((packed)); | 151 | } __packed; |
152 | 152 | ||
153 | #endif /* _LINUX_IF_HIPPI_H */ | 153 | #endif /* _LINUX_IF_HIPPI_H */ |
diff --git a/include/linux/if_link.h b/include/linux/if_link.h index 85c812db5a3f..7fcad2e1be3d 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h | |||
@@ -4,7 +4,7 @@ | |||
4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
5 | #include <linux/netlink.h> | 5 | #include <linux/netlink.h> |
6 | 6 | ||
7 | /* The struct should be in sync with struct net_device_stats */ | 7 | /* This struct should be in sync with struct rtnl_link_stats64 */ |
8 | struct rtnl_link_stats { | 8 | struct rtnl_link_stats { |
9 | __u32 rx_packets; /* total packets received */ | 9 | __u32 rx_packets; /* total packets received */ |
10 | __u32 tx_packets; /* total packets transmitted */ | 10 | __u32 tx_packets; /* total packets transmitted */ |
@@ -37,6 +37,7 @@ struct rtnl_link_stats { | |||
37 | __u32 tx_compressed; | 37 | __u32 tx_compressed; |
38 | }; | 38 | }; |
39 | 39 | ||
40 | /* The main device statistics structure */ | ||
40 | struct rtnl_link_stats64 { | 41 | struct rtnl_link_stats64 { |
41 | __u64 rx_packets; /* total packets received */ | 42 | __u64 rx_packets; /* total packets received */ |
42 | __u64 tx_packets; /* total packets transmitted */ | 43 | __u64 tx_packets; /* total packets transmitted */ |
diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h index 9ea047aca795..c26a0e4f0ce8 100644 --- a/include/linux/if_macvlan.h +++ b/include/linux/if_macvlan.h | |||
@@ -84,8 +84,4 @@ extern int macvlan_link_register(struct rtnl_link_ops *ops); | |||
84 | extern netdev_tx_t macvlan_start_xmit(struct sk_buff *skb, | 84 | extern netdev_tx_t macvlan_start_xmit(struct sk_buff *skb, |
85 | struct net_device *dev); | 85 | struct net_device *dev); |
86 | 86 | ||
87 | |||
88 | extern struct sk_buff *(*macvlan_handle_frame_hook)(struct macvlan_port *, | ||
89 | struct sk_buff *); | ||
90 | |||
91 | #endif /* _LINUX_IF_MACVLAN_H */ | 87 | #endif /* _LINUX_IF_MACVLAN_H */ |
diff --git a/include/linux/if_packet.h b/include/linux/if_packet.h index 6ac23ef1801a..72bfa5a034dd 100644 --- a/include/linux/if_packet.h +++ b/include/linux/if_packet.h | |||
@@ -48,6 +48,7 @@ struct sockaddr_ll { | |||
48 | #define PACKET_LOSS 14 | 48 | #define PACKET_LOSS 14 |
49 | #define PACKET_VNET_HDR 15 | 49 | #define PACKET_VNET_HDR 15 |
50 | #define PACKET_TX_TIMESTAMP 16 | 50 | #define PACKET_TX_TIMESTAMP 16 |
51 | #define PACKET_TIMESTAMP 17 | ||
51 | 52 | ||
52 | struct tpacket_stats { | 53 | struct tpacket_stats { |
53 | unsigned int tp_packets; | 54 | unsigned int tp_packets; |
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h index a6577af0c4e6..1925e0c3f162 100644 --- a/include/linux/if_pppox.h +++ b/include/linux/if_pppox.h | |||
@@ -59,7 +59,7 @@ struct sockaddr_pppox { | |||
59 | union{ | 59 | union{ |
60 | struct pppoe_addr pppoe; | 60 | struct pppoe_addr pppoe; |
61 | }sa_addr; | 61 | }sa_addr; |
62 | }__attribute__ ((packed)); | 62 | } __packed; |
63 | 63 | ||
64 | /* The use of the above union isn't viable because the size of this | 64 | /* The use of the above union isn't viable because the size of this |
65 | * struct must stay fixed over time -- applications use sizeof(struct | 65 | * struct must stay fixed over time -- applications use sizeof(struct |
@@ -70,7 +70,7 @@ struct sockaddr_pppol2tp { | |||
70 | sa_family_t sa_family; /* address family, AF_PPPOX */ | 70 | sa_family_t sa_family; /* address family, AF_PPPOX */ |
71 | unsigned int sa_protocol; /* protocol identifier */ | 71 | unsigned int sa_protocol; /* protocol identifier */ |
72 | struct pppol2tp_addr pppol2tp; | 72 | struct pppol2tp_addr pppol2tp; |
73 | }__attribute__ ((packed)); | 73 | } __packed; |
74 | 74 | ||
75 | /* The L2TPv3 protocol changes tunnel and session ids from 16 to 32 | 75 | /* The L2TPv3 protocol changes tunnel and session ids from 16 to 32 |
76 | * bits. So we need a different sockaddr structure. | 76 | * bits. So we need a different sockaddr structure. |
@@ -79,7 +79,7 @@ struct sockaddr_pppol2tpv3 { | |||
79 | sa_family_t sa_family; /* address family, AF_PPPOX */ | 79 | sa_family_t sa_family; /* address family, AF_PPPOX */ |
80 | unsigned int sa_protocol; /* protocol identifier */ | 80 | unsigned int sa_protocol; /* protocol identifier */ |
81 | struct pppol2tpv3_addr pppol2tp; | 81 | struct pppol2tpv3_addr pppol2tp; |
82 | } __attribute__ ((packed)); | 82 | } __packed; |
83 | 83 | ||
84 | /********************************************************************* | 84 | /********************************************************************* |
85 | * | 85 | * |
@@ -129,7 +129,7 @@ struct pppoe_hdr { | |||
129 | __be16 sid; | 129 | __be16 sid; |
130 | __be16 length; | 130 | __be16 length; |
131 | struct pppoe_tag tag[0]; | 131 | struct pppoe_tag tag[0]; |
132 | } __attribute__ ((packed)); | 132 | } __packed; |
133 | 133 | ||
134 | /* Length of entire PPPoE + PPP header */ | 134 | /* Length of entire PPPoE + PPP header */ |
135 | #define PPPOE_SES_HLEN 8 | 135 | #define PPPOE_SES_HLEN 8 |
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 99e1ab7e3eec..940e21595351 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h | |||
@@ -58,7 +58,7 @@ struct ipv6_opt_hdr { | |||
58 | /* | 58 | /* |
59 | * TLV encoded option data follows. | 59 | * TLV encoded option data follows. |
60 | */ | 60 | */ |
61 | } __attribute__ ((packed)); /* required for some archs */ | 61 | } __packed; /* required for some archs */ |
62 | 62 | ||
63 | #define ipv6_destopt_hdr ipv6_opt_hdr | 63 | #define ipv6_destopt_hdr ipv6_opt_hdr |
64 | #define ipv6_hopopt_hdr ipv6_opt_hdr | 64 | #define ipv6_hopopt_hdr ipv6_opt_hdr |
@@ -99,7 +99,7 @@ struct ipv6_destopt_hao { | |||
99 | __u8 type; | 99 | __u8 type; |
100 | __u8 length; | 100 | __u8 length; |
101 | struct in6_addr addr; | 101 | struct in6_addr addr; |
102 | } __attribute__ ((__packed__)); | 102 | } __packed; |
103 | 103 | ||
104 | /* | 104 | /* |
105 | * IPv6 fixed header | 105 | * IPv6 fixed header |
diff --git a/include/linux/isdnif.h b/include/linux/isdnif.h index b9b5a684ed69..b8c23f88dd54 100644 --- a/include/linux/isdnif.h +++ b/include/linux/isdnif.h | |||
@@ -317,7 +317,7 @@ typedef struct T30_s { | |||
317 | __u8 r_scantime; | 317 | __u8 r_scantime; |
318 | __u8 r_id[FAXIDLEN]; | 318 | __u8 r_id[FAXIDLEN]; |
319 | __u8 r_code; | 319 | __u8 r_code; |
320 | } __attribute__((packed)) T30_s; | 320 | } __packed T30_s; |
321 | 321 | ||
322 | #define ISDN_TTY_FAX_CONN_IN 0 | 322 | #define ISDN_TTY_FAX_CONN_IN 0 |
323 | #define ISDN_TTY_FAX_CONN_OUT 1 | 323 | #define ISDN_TTY_FAX_CONN_OUT 1 |
diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h index 78c3bed1c3f5..b5e7f2202484 100644 --- a/include/linux/mISDNif.h +++ b/include/linux/mISDNif.h | |||
@@ -251,7 +251,7 @@ | |||
251 | struct mISDNhead { | 251 | struct mISDNhead { |
252 | unsigned int prim; | 252 | unsigned int prim; |
253 | unsigned int id; | 253 | unsigned int id; |
254 | } __attribute__((packed)); | 254 | } __packed; |
255 | 255 | ||
256 | #define MISDN_HEADER_LEN sizeof(struct mISDNhead) | 256 | #define MISDN_HEADER_LEN sizeof(struct mISDNhead) |
257 | #define MAX_DATA_SIZE 2048 | 257 | #define MAX_DATA_SIZE 2048 |
diff --git a/include/linux/nbd.h b/include/linux/nbd.h index 155719dab813..bb58854a8061 100644 --- a/include/linux/nbd.h +++ b/include/linux/nbd.h | |||
@@ -88,7 +88,7 @@ struct nbd_request { | |||
88 | char handle[8]; | 88 | char handle[8]; |
89 | __be64 from; | 89 | __be64 from; |
90 | __be32 len; | 90 | __be32 len; |
91 | } __attribute__ ((packed)); | 91 | } __packed; |
92 | 92 | ||
93 | /* | 93 | /* |
94 | * This is the reply packet that nbd-server sends back to the client after | 94 | * This is the reply packet that nbd-server sends back to the client after |
diff --git a/include/linux/ncp.h b/include/linux/ncp.h index 99f0adeeb3f3..3ace8370e61e 100644 --- a/include/linux/ncp.h +++ b/include/linux/ncp.h | |||
@@ -27,7 +27,7 @@ struct ncp_request_header { | |||
27 | __u8 conn_high; | 27 | __u8 conn_high; |
28 | __u8 function; | 28 | __u8 function; |
29 | __u8 data[0]; | 29 | __u8 data[0]; |
30 | } __attribute__((packed)); | 30 | } __packed; |
31 | 31 | ||
32 | #define NCP_REPLY (0x3333) | 32 | #define NCP_REPLY (0x3333) |
33 | #define NCP_WATCHDOG (0x3E3E) | 33 | #define NCP_WATCHDOG (0x3E3E) |
@@ -42,7 +42,7 @@ struct ncp_reply_header { | |||
42 | __u8 completion_code; | 42 | __u8 completion_code; |
43 | __u8 connection_state; | 43 | __u8 connection_state; |
44 | __u8 data[0]; | 44 | __u8 data[0]; |
45 | } __attribute__((packed)); | 45 | } __packed; |
46 | 46 | ||
47 | #define NCP_VOLNAME_LEN (16) | 47 | #define NCP_VOLNAME_LEN (16) |
48 | #define NCP_NUMBER_OF_VOLUMES (256) | 48 | #define NCP_NUMBER_OF_VOLUMES (256) |
@@ -158,7 +158,7 @@ struct nw_info_struct { | |||
158 | #ifdef __KERNEL__ | 158 | #ifdef __KERNEL__ |
159 | struct nw_nfs_info nfs; | 159 | struct nw_nfs_info nfs; |
160 | #endif | 160 | #endif |
161 | } __attribute__((packed)); | 161 | } __packed; |
162 | 162 | ||
163 | /* modify mask - use with MODIFY_DOS_INFO structure */ | 163 | /* modify mask - use with MODIFY_DOS_INFO structure */ |
164 | #define DM_ATTRIBUTES (cpu_to_le32(0x02)) | 164 | #define DM_ATTRIBUTES (cpu_to_le32(0x02)) |
@@ -190,12 +190,12 @@ struct nw_modify_dos_info { | |||
190 | __u16 inheritanceGrantMask; | 190 | __u16 inheritanceGrantMask; |
191 | __u16 inheritanceRevokeMask; | 191 | __u16 inheritanceRevokeMask; |
192 | __u32 maximumSpace; | 192 | __u32 maximumSpace; |
193 | } __attribute__((packed)); | 193 | } __packed; |
194 | 194 | ||
195 | struct nw_search_sequence { | 195 | struct nw_search_sequence { |
196 | __u8 volNumber; | 196 | __u8 volNumber; |
197 | __u32 dirBase; | 197 | __u32 dirBase; |
198 | __u32 sequence; | 198 | __u32 sequence; |
199 | } __attribute__((packed)); | 199 | } __packed; |
200 | 200 | ||
201 | #endif /* _LINUX_NCP_H */ | 201 | #endif /* _LINUX_NCP_H */ |
diff --git a/include/linux/ncp_fs_sb.h b/include/linux/ncp_fs_sb.h index 5ec9ca671687..8da05bc098ca 100644 --- a/include/linux/ncp_fs_sb.h +++ b/include/linux/ncp_fs_sb.h | |||
@@ -104,13 +104,13 @@ struct ncp_server { | |||
104 | 104 | ||
105 | unsigned int state; /* STREAM only: receiver state */ | 105 | unsigned int state; /* STREAM only: receiver state */ |
106 | struct { | 106 | struct { |
107 | __u32 magic __attribute__((packed)); | 107 | __u32 magic __packed; |
108 | __u32 len __attribute__((packed)); | 108 | __u32 len __packed; |
109 | __u16 type __attribute__((packed)); | 109 | __u16 type __packed; |
110 | __u16 p1 __attribute__((packed)); | 110 | __u16 p1 __packed; |
111 | __u16 p2 __attribute__((packed)); | 111 | __u16 p2 __packed; |
112 | __u16 p3 __attribute__((packed)); | 112 | __u16 p3 __packed; |
113 | __u16 type2 __attribute__((packed)); | 113 | __u16 type2 __packed; |
114 | } buf; /* STREAM only: temporary buffer */ | 114 | } buf; /* STREAM only: temporary buffer */ |
115 | unsigned char* ptr; /* STREAM only: pointer to data */ | 115 | unsigned char* ptr; /* STREAM only: pointer to data */ |
116 | size_t len; /* STREAM only: length of data to receive */ | 116 | size_t len; /* STREAM only: length of data to receive */ |
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index a24916156f4e..4fbccc5f609a 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -159,45 +159,49 @@ static inline bool dev_xmit_complete(int rc) | |||
159 | #define MAX_HEADER (LL_MAX_HEADER + 48) | 159 | #define MAX_HEADER (LL_MAX_HEADER + 48) |
160 | #endif | 160 | #endif |
161 | 161 | ||
162 | #endif /* __KERNEL__ */ | ||
163 | |||
164 | /* | 162 | /* |
165 | * Network device statistics. Akin to the 2.0 ether stats but | 163 | * Old network device statistics. Fields are native words |
166 | * with byte counters. | 164 | * (unsigned long) so they can be read and written atomically. |
165 | * Each field is padded to 64 bits for compatibility with | ||
166 | * rtnl_link_stats64. | ||
167 | */ | 167 | */ |
168 | 168 | ||
169 | #if BITS_PER_LONG == 64 | ||
170 | #define NET_DEVICE_STATS_DEFINE(name) unsigned long name | ||
171 | #elif defined(__LITTLE_ENDIAN) | ||
172 | #define NET_DEVICE_STATS_DEFINE(name) unsigned long name, pad_ ## name | ||
173 | #else | ||
174 | #define NET_DEVICE_STATS_DEFINE(name) unsigned long pad_ ## name, name | ||
175 | #endif | ||
176 | |||
169 | struct net_device_stats { | 177 | struct net_device_stats { |
170 | unsigned long rx_packets; /* total packets received */ | 178 | NET_DEVICE_STATS_DEFINE(rx_packets); |
171 | unsigned long tx_packets; /* total packets transmitted */ | 179 | NET_DEVICE_STATS_DEFINE(tx_packets); |
172 | unsigned long rx_bytes; /* total bytes received */ | 180 | NET_DEVICE_STATS_DEFINE(rx_bytes); |
173 | unsigned long tx_bytes; /* total bytes transmitted */ | 181 | NET_DEVICE_STATS_DEFINE(tx_bytes); |
174 | unsigned long rx_errors; /* bad packets received */ | 182 | NET_DEVICE_STATS_DEFINE(rx_errors); |
175 | unsigned long tx_errors; /* packet transmit problems */ | 183 | NET_DEVICE_STATS_DEFINE(tx_errors); |
176 | unsigned long rx_dropped; /* no space in linux buffers */ | 184 | NET_DEVICE_STATS_DEFINE(rx_dropped); |
177 | unsigned long tx_dropped; /* no space available in linux */ | 185 | NET_DEVICE_STATS_DEFINE(tx_dropped); |
178 | unsigned long multicast; /* multicast packets received */ | 186 | NET_DEVICE_STATS_DEFINE(multicast); |
179 | unsigned long collisions; | 187 | NET_DEVICE_STATS_DEFINE(collisions); |
180 | 188 | NET_DEVICE_STATS_DEFINE(rx_length_errors); | |
181 | /* detailed rx_errors: */ | 189 | NET_DEVICE_STATS_DEFINE(rx_over_errors); |
182 | unsigned long rx_length_errors; | 190 | NET_DEVICE_STATS_DEFINE(rx_crc_errors); |
183 | unsigned long rx_over_errors; /* receiver ring buff overflow */ | 191 | NET_DEVICE_STATS_DEFINE(rx_frame_errors); |
184 | unsigned long rx_crc_errors; /* recved pkt with crc error */ | 192 | NET_DEVICE_STATS_DEFINE(rx_fifo_errors); |
185 | unsigned long rx_frame_errors; /* recv'd frame alignment error */ | 193 | NET_DEVICE_STATS_DEFINE(rx_missed_errors); |
186 | unsigned long rx_fifo_errors; /* recv'r fifo overrun */ | 194 | NET_DEVICE_STATS_DEFINE(tx_aborted_errors); |
187 | unsigned long rx_missed_errors; /* receiver missed packet */ | 195 | NET_DEVICE_STATS_DEFINE(tx_carrier_errors); |
188 | 196 | NET_DEVICE_STATS_DEFINE(tx_fifo_errors); | |
189 | /* detailed tx_errors */ | 197 | NET_DEVICE_STATS_DEFINE(tx_heartbeat_errors); |
190 | unsigned long tx_aborted_errors; | 198 | NET_DEVICE_STATS_DEFINE(tx_window_errors); |
191 | unsigned long tx_carrier_errors; | 199 | NET_DEVICE_STATS_DEFINE(rx_compressed); |
192 | unsigned long tx_fifo_errors; | 200 | NET_DEVICE_STATS_DEFINE(tx_compressed); |
193 | unsigned long tx_heartbeat_errors; | ||
194 | unsigned long tx_window_errors; | ||
195 | |||
196 | /* for cslip etc */ | ||
197 | unsigned long rx_compressed; | ||
198 | unsigned long tx_compressed; | ||
199 | }; | 201 | }; |
200 | 202 | ||
203 | #endif /* __KERNEL__ */ | ||
204 | |||
201 | 205 | ||
202 | /* Media selection options. */ | 206 | /* Media selection options. */ |
203 | enum { | 207 | enum { |
@@ -381,6 +385,8 @@ enum gro_result { | |||
381 | }; | 385 | }; |
382 | typedef enum gro_result gro_result_t; | 386 | typedef enum gro_result gro_result_t; |
383 | 387 | ||
388 | typedef struct sk_buff *rx_handler_func_t(struct sk_buff *skb); | ||
389 | |||
384 | extern void __napi_schedule(struct napi_struct *n); | 390 | extern void __napi_schedule(struct napi_struct *n); |
385 | 391 | ||
386 | static inline int napi_disable_pending(struct napi_struct *n) | 392 | static inline int napi_disable_pending(struct napi_struct *n) |
@@ -660,10 +666,19 @@ struct netdev_rx_queue { | |||
660 | * Callback uses when the transmitter has not made any progress | 666 | * Callback uses when the transmitter has not made any progress |
661 | * for dev->watchdog ticks. | 667 | * for dev->watchdog ticks. |
662 | * | 668 | * |
669 | * struct rtnl_link_stats64* (*ndo_get_stats64)(struct net_device *dev); | ||
663 | * struct net_device_stats* (*ndo_get_stats)(struct net_device *dev); | 670 | * struct net_device_stats* (*ndo_get_stats)(struct net_device *dev); |
664 | * Called when a user wants to get the network device usage | 671 | * Called when a user wants to get the network device usage |
665 | * statistics. If not defined, the counters in dev->stats will | 672 | * statistics. Drivers must do one of the following: |
666 | * be used. | 673 | * 1. Define @ndo_get_stats64 to update a rtnl_link_stats64 structure |
674 | * (which should normally be dev->stats64) and return a ponter to | ||
675 | * it. The structure must not be changed asynchronously. | ||
676 | * 2. Define @ndo_get_stats to update a net_device_stats64 structure | ||
677 | * (which should normally be dev->stats) and return a pointer to | ||
678 | * it. The structure may be changed asynchronously only if each | ||
679 | * field is written atomically. | ||
680 | * 3. Update dev->stats asynchronously and atomically, and define | ||
681 | * neither operation. | ||
667 | * | 682 | * |
668 | * void (*ndo_vlan_rx_register)(struct net_device *dev, struct vlan_group *grp); | 683 | * void (*ndo_vlan_rx_register)(struct net_device *dev, struct vlan_group *grp); |
669 | * If device support VLAN receive accleration | 684 | * If device support VLAN receive accleration |
@@ -718,6 +733,7 @@ struct net_device_ops { | |||
718 | struct neigh_parms *); | 733 | struct neigh_parms *); |
719 | void (*ndo_tx_timeout) (struct net_device *dev); | 734 | void (*ndo_tx_timeout) (struct net_device *dev); |
720 | 735 | ||
736 | struct rtnl_link_stats64* (*ndo_get_stats64)(struct net_device *dev); | ||
721 | struct net_device_stats* (*ndo_get_stats)(struct net_device *dev); | 737 | struct net_device_stats* (*ndo_get_stats)(struct net_device *dev); |
722 | 738 | ||
723 | void (*ndo_vlan_rx_register)(struct net_device *dev, | 739 | void (*ndo_vlan_rx_register)(struct net_device *dev, |
@@ -867,7 +883,10 @@ struct net_device { | |||
867 | int ifindex; | 883 | int ifindex; |
868 | int iflink; | 884 | int iflink; |
869 | 885 | ||
870 | struct net_device_stats stats; | 886 | union { |
887 | struct rtnl_link_stats64 stats64; | ||
888 | struct net_device_stats stats; | ||
889 | }; | ||
871 | 890 | ||
872 | #ifdef CONFIG_WIRELESS_EXT | 891 | #ifdef CONFIG_WIRELESS_EXT |
873 | /* List of functions to handle Wireless Extensions (instead of ioctl). | 892 | /* List of functions to handle Wireless Extensions (instead of ioctl). |
@@ -957,6 +976,7 @@ struct net_device { | |||
957 | #endif | 976 | #endif |
958 | 977 | ||
959 | struct netdev_queue rx_queue; | 978 | struct netdev_queue rx_queue; |
979 | rx_handler_func_t *rx_handler; | ||
960 | 980 | ||
961 | struct netdev_queue *_tx ____cacheline_aligned_in_smp; | 981 | struct netdev_queue *_tx ____cacheline_aligned_in_smp; |
962 | 982 | ||
@@ -1087,11 +1107,7 @@ static inline void netdev_for_each_tx_queue(struct net_device *dev, | |||
1087 | static inline | 1107 | static inline |
1088 | struct net *dev_net(const struct net_device *dev) | 1108 | struct net *dev_net(const struct net_device *dev) |
1089 | { | 1109 | { |
1090 | #ifdef CONFIG_NET_NS | 1110 | return read_pnet(&dev->nd_net); |
1091 | return dev->nd_net; | ||
1092 | #else | ||
1093 | return &init_net; | ||
1094 | #endif | ||
1095 | } | 1111 | } |
1096 | 1112 | ||
1097 | static inline | 1113 | static inline |
@@ -1272,8 +1288,8 @@ extern void dev_add_pack(struct packet_type *pt); | |||
1272 | extern void dev_remove_pack(struct packet_type *pt); | 1288 | extern void dev_remove_pack(struct packet_type *pt); |
1273 | extern void __dev_remove_pack(struct packet_type *pt); | 1289 | extern void __dev_remove_pack(struct packet_type *pt); |
1274 | 1290 | ||
1275 | extern struct net_device *dev_get_by_flags(struct net *net, unsigned short flags, | 1291 | extern struct net_device *dev_get_by_flags_rcu(struct net *net, unsigned short flags, |
1276 | unsigned short mask); | 1292 | unsigned short mask); |
1277 | extern struct net_device *dev_get_by_name(struct net *net, const char *name); | 1293 | extern struct net_device *dev_get_by_name(struct net *net, const char *name); |
1278 | extern struct net_device *dev_get_by_name_rcu(struct net *net, const char *name); | 1294 | extern struct net_device *dev_get_by_name_rcu(struct net *net, const char *name); |
1279 | extern struct net_device *__dev_get_by_name(struct net *net, const char *name); | 1295 | extern struct net_device *__dev_get_by_name(struct net *net, const char *name); |
@@ -1693,6 +1709,10 @@ static inline void napi_free_frags(struct napi_struct *napi) | |||
1693 | napi->skb = NULL; | 1709 | napi->skb = NULL; |
1694 | } | 1710 | } |
1695 | 1711 | ||
1712 | extern int netdev_rx_handler_register(struct net_device *dev, | ||
1713 | rx_handler_func_t *rx_handler); | ||
1714 | extern void netdev_rx_handler_unregister(struct net_device *dev); | ||
1715 | |||
1696 | extern void netif_nit_deliver(struct sk_buff *skb); | 1716 | extern void netif_nit_deliver(struct sk_buff *skb); |
1697 | extern int dev_valid_name(const char *name); | 1717 | extern int dev_valid_name(const char *name); |
1698 | extern int dev_ioctl(struct net *net, unsigned int cmd, void __user *); | 1718 | extern int dev_ioctl(struct net *net, unsigned int cmd, void __user *); |
@@ -2118,7 +2138,7 @@ extern void netdev_features_change(struct net_device *dev); | |||
2118 | /* Load a device via the kmod */ | 2138 | /* Load a device via the kmod */ |
2119 | extern void dev_load(struct net *net, const char *name); | 2139 | extern void dev_load(struct net *net, const char *name); |
2120 | extern void dev_mcast_init(void); | 2140 | extern void dev_mcast_init(void); |
2121 | extern const struct net_device_stats *dev_get_stats(struct net_device *dev); | 2141 | extern const struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev); |
2122 | extern void dev_txq_stats_fold(const struct net_device *dev, struct net_device_stats *stats); | 2142 | extern void dev_txq_stats_fold(const struct net_device *dev, struct net_device_stats *stats); |
2123 | 2143 | ||
2124 | extern int netdev_max_backlog; | 2144 | extern int netdev_max_backlog; |
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index c00cc0c4d0b7..24e5d01d27d0 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h | |||
@@ -397,7 +397,7 @@ struct xt_table_info { | |||
397 | * @stacksize jumps (number of user chains) can possibly be made. | 397 | * @stacksize jumps (number of user chains) can possibly be made. |
398 | */ | 398 | */ |
399 | unsigned int stacksize; | 399 | unsigned int stacksize; |
400 | unsigned int *stackptr; | 400 | unsigned int __percpu *stackptr; |
401 | void ***jumpstack; | 401 | void ***jumpstack; |
402 | /* ipt_entry tables: one per CPU */ | 402 | /* ipt_entry tables: one per CPU */ |
403 | /* Note : this field MUST be the last one, see XT_TABLE_INFO_SZ */ | 403 | /* Note : this field MUST be the last one, see XT_TABLE_INFO_SZ */ |
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h index b7c77f9712f4..64fb32b93a28 100644 --- a/include/linux/nl80211.h +++ b/include/linux/nl80211.h | |||
@@ -132,7 +132,7 @@ | |||
132 | * %NL80211_ATTR_REG_RULE_POWER_MAX_ANT_GAIN and | 132 | * %NL80211_ATTR_REG_RULE_POWER_MAX_ANT_GAIN and |
133 | * %NL80211_ATTR_REG_RULE_POWER_MAX_EIRP. | 133 | * %NL80211_ATTR_REG_RULE_POWER_MAX_EIRP. |
134 | * @NL80211_CMD_REQ_SET_REG: ask the wireless core to set the regulatory domain | 134 | * @NL80211_CMD_REQ_SET_REG: ask the wireless core to set the regulatory domain |
135 | * to the the specified ISO/IEC 3166-1 alpha2 country code. The core will | 135 | * to the specified ISO/IEC 3166-1 alpha2 country code. The core will |
136 | * store this as a valid request and then query userspace for it. | 136 | * store this as a valid request and then query userspace for it. |
137 | * | 137 | * |
138 | * @NL80211_CMD_GET_MESH_PARAMS: Get mesh networking properties for the | 138 | * @NL80211_CMD_GET_MESH_PARAMS: Get mesh networking properties for the |
diff --git a/include/linux/phonet.h b/include/linux/phonet.h index e5126cff9b2a..24426c3d6b5a 100644 --- a/include/linux/phonet.h +++ b/include/linux/phonet.h | |||
@@ -56,7 +56,7 @@ struct phonethdr { | |||
56 | __be16 pn_length; | 56 | __be16 pn_length; |
57 | __u8 pn_robj; | 57 | __u8 pn_robj; |
58 | __u8 pn_sobj; | 58 | __u8 pn_sobj; |
59 | } __attribute__((packed)); | 59 | } __packed; |
60 | 60 | ||
61 | /* Common Phonet payload header */ | 61 | /* Common Phonet payload header */ |
62 | struct phonetmsg { | 62 | struct phonetmsg { |
@@ -98,7 +98,7 @@ struct sockaddr_pn { | |||
98 | __u8 spn_dev; | 98 | __u8 spn_dev; |
99 | __u8 spn_resource; | 99 | __u8 spn_resource; |
100 | __u8 spn_zero[sizeof(struct sockaddr) - sizeof(sa_family_t) - 3]; | 100 | __u8 spn_zero[sizeof(struct sockaddr) - sizeof(sa_family_t) - 3]; |
101 | } __attribute__ ((packed)); | 101 | } __packed; |
102 | 102 | ||
103 | /* Well known address */ | 103 | /* Well known address */ |
104 | #define PN_DEV_PC 0x10 | 104 | #define PN_DEV_PC 0x10 |
diff --git a/include/linux/rds.h b/include/linux/rds.h index cab4994c2f63..24bce3ded9ea 100644 --- a/include/linux/rds.h +++ b/include/linux/rds.h | |||
@@ -100,7 +100,7 @@ | |||
100 | struct rds_info_counter { | 100 | struct rds_info_counter { |
101 | u_int8_t name[32]; | 101 | u_int8_t name[32]; |
102 | u_int64_t value; | 102 | u_int64_t value; |
103 | } __attribute__((packed)); | 103 | } __packed; |
104 | 104 | ||
105 | #define RDS_INFO_CONNECTION_FLAG_SENDING 0x01 | 105 | #define RDS_INFO_CONNECTION_FLAG_SENDING 0x01 |
106 | #define RDS_INFO_CONNECTION_FLAG_CONNECTING 0x02 | 106 | #define RDS_INFO_CONNECTION_FLAG_CONNECTING 0x02 |
@@ -115,7 +115,7 @@ struct rds_info_connection { | |||
115 | __be32 faddr; | 115 | __be32 faddr; |
116 | u_int8_t transport[TRANSNAMSIZ]; /* null term ascii */ | 116 | u_int8_t transport[TRANSNAMSIZ]; /* null term ascii */ |
117 | u_int8_t flags; | 117 | u_int8_t flags; |
118 | } __attribute__((packed)); | 118 | } __packed; |
119 | 119 | ||
120 | struct rds_info_flow { | 120 | struct rds_info_flow { |
121 | __be32 laddr; | 121 | __be32 laddr; |
@@ -123,7 +123,7 @@ struct rds_info_flow { | |||
123 | u_int32_t bytes; | 123 | u_int32_t bytes; |
124 | __be16 lport; | 124 | __be16 lport; |
125 | __be16 fport; | 125 | __be16 fport; |
126 | } __attribute__((packed)); | 126 | } __packed; |
127 | 127 | ||
128 | #define RDS_INFO_MESSAGE_FLAG_ACK 0x01 | 128 | #define RDS_INFO_MESSAGE_FLAG_ACK 0x01 |
129 | #define RDS_INFO_MESSAGE_FLAG_FAST_ACK 0x02 | 129 | #define RDS_INFO_MESSAGE_FLAG_FAST_ACK 0x02 |
@@ -136,7 +136,7 @@ struct rds_info_message { | |||
136 | __be16 lport; | 136 | __be16 lport; |
137 | __be16 fport; | 137 | __be16 fport; |
138 | u_int8_t flags; | 138 | u_int8_t flags; |
139 | } __attribute__((packed)); | 139 | } __packed; |
140 | 140 | ||
141 | struct rds_info_socket { | 141 | struct rds_info_socket { |
142 | u_int32_t sndbuf; | 142 | u_int32_t sndbuf; |
@@ -146,7 +146,7 @@ struct rds_info_socket { | |||
146 | __be16 connected_port; | 146 | __be16 connected_port; |
147 | u_int32_t rcvbuf; | 147 | u_int32_t rcvbuf; |
148 | u_int64_t inum; | 148 | u_int64_t inum; |
149 | } __attribute__((packed)); | 149 | } __packed; |
150 | 150 | ||
151 | struct rds_info_tcp_socket { | 151 | struct rds_info_tcp_socket { |
152 | __be32 local_addr; | 152 | __be32 local_addr; |
@@ -158,7 +158,7 @@ struct rds_info_tcp_socket { | |||
158 | u_int32_t last_sent_nxt; | 158 | u_int32_t last_sent_nxt; |
159 | u_int32_t last_expected_una; | 159 | u_int32_t last_expected_una; |
160 | u_int32_t last_seen_una; | 160 | u_int32_t last_seen_una; |
161 | } __attribute__((packed)); | 161 | } __packed; |
162 | 162 | ||
163 | #define RDS_IB_GID_LEN 16 | 163 | #define RDS_IB_GID_LEN 16 |
164 | struct rds_info_rdma_connection { | 164 | struct rds_info_rdma_connection { |
diff --git a/include/linux/sctp.h b/include/linux/sctp.h index c20d3ce673c0..c11a28706fa4 100644 --- a/include/linux/sctp.h +++ b/include/linux/sctp.h | |||
@@ -61,7 +61,7 @@ typedef struct sctphdr { | |||
61 | __be16 dest; | 61 | __be16 dest; |
62 | __be32 vtag; | 62 | __be32 vtag; |
63 | __le32 checksum; | 63 | __le32 checksum; |
64 | } __attribute__((packed)) sctp_sctphdr_t; | 64 | } __packed sctp_sctphdr_t; |
65 | 65 | ||
66 | #ifdef __KERNEL__ | 66 | #ifdef __KERNEL__ |
67 | #include <linux/skbuff.h> | 67 | #include <linux/skbuff.h> |
@@ -77,7 +77,7 @@ typedef struct sctp_chunkhdr { | |||
77 | __u8 type; | 77 | __u8 type; |
78 | __u8 flags; | 78 | __u8 flags; |
79 | __be16 length; | 79 | __be16 length; |
80 | } __attribute__((packed)) sctp_chunkhdr_t; | 80 | } __packed sctp_chunkhdr_t; |
81 | 81 | ||
82 | 82 | ||
83 | /* Section 3.2. Chunk Type Values. | 83 | /* Section 3.2. Chunk Type Values. |
@@ -167,7 +167,7 @@ enum { SCTP_CHUNK_FLAG_T = 0x01 }; | |||
167 | typedef struct sctp_paramhdr { | 167 | typedef struct sctp_paramhdr { |
168 | __be16 type; | 168 | __be16 type; |
169 | __be16 length; | 169 | __be16 length; |
170 | } __attribute__((packed)) sctp_paramhdr_t; | 170 | } __packed sctp_paramhdr_t; |
171 | 171 | ||
172 | typedef enum { | 172 | typedef enum { |
173 | 173 | ||
@@ -228,12 +228,12 @@ typedef struct sctp_datahdr { | |||
228 | __be16 ssn; | 228 | __be16 ssn; |
229 | __be32 ppid; | 229 | __be32 ppid; |
230 | __u8 payload[0]; | 230 | __u8 payload[0]; |
231 | } __attribute__((packed)) sctp_datahdr_t; | 231 | } __packed sctp_datahdr_t; |
232 | 232 | ||
233 | typedef struct sctp_data_chunk { | 233 | typedef struct sctp_data_chunk { |
234 | sctp_chunkhdr_t chunk_hdr; | 234 | sctp_chunkhdr_t chunk_hdr; |
235 | sctp_datahdr_t data_hdr; | 235 | sctp_datahdr_t data_hdr; |
236 | } __attribute__((packed)) sctp_data_chunk_t; | 236 | } __packed sctp_data_chunk_t; |
237 | 237 | ||
238 | /* DATA Chuck Specific Flags */ | 238 | /* DATA Chuck Specific Flags */ |
239 | enum { | 239 | enum { |
@@ -259,78 +259,78 @@ typedef struct sctp_inithdr { | |||
259 | __be16 num_inbound_streams; | 259 | __be16 num_inbound_streams; |
260 | __be32 initial_tsn; | 260 | __be32 initial_tsn; |
261 | __u8 params[0]; | 261 | __u8 params[0]; |
262 | } __attribute__((packed)) sctp_inithdr_t; | 262 | } __packed sctp_inithdr_t; |
263 | 263 | ||
264 | typedef struct sctp_init_chunk { | 264 | typedef struct sctp_init_chunk { |
265 | sctp_chunkhdr_t chunk_hdr; | 265 | sctp_chunkhdr_t chunk_hdr; |
266 | sctp_inithdr_t init_hdr; | 266 | sctp_inithdr_t init_hdr; |
267 | } __attribute__((packed)) sctp_init_chunk_t; | 267 | } __packed sctp_init_chunk_t; |
268 | 268 | ||
269 | 269 | ||
270 | /* Section 3.3.2.1. IPv4 Address Parameter (5) */ | 270 | /* Section 3.3.2.1. IPv4 Address Parameter (5) */ |
271 | typedef struct sctp_ipv4addr_param { | 271 | typedef struct sctp_ipv4addr_param { |
272 | sctp_paramhdr_t param_hdr; | 272 | sctp_paramhdr_t param_hdr; |
273 | struct in_addr addr; | 273 | struct in_addr addr; |
274 | } __attribute__((packed)) sctp_ipv4addr_param_t; | 274 | } __packed sctp_ipv4addr_param_t; |
275 | 275 | ||
276 | /* Section 3.3.2.1. IPv6 Address Parameter (6) */ | 276 | /* Section 3.3.2.1. IPv6 Address Parameter (6) */ |
277 | typedef struct sctp_ipv6addr_param { | 277 | typedef struct sctp_ipv6addr_param { |
278 | sctp_paramhdr_t param_hdr; | 278 | sctp_paramhdr_t param_hdr; |
279 | struct in6_addr addr; | 279 | struct in6_addr addr; |
280 | } __attribute__((packed)) sctp_ipv6addr_param_t; | 280 | } __packed sctp_ipv6addr_param_t; |
281 | 281 | ||
282 | /* Section 3.3.2.1 Cookie Preservative (9) */ | 282 | /* Section 3.3.2.1 Cookie Preservative (9) */ |
283 | typedef struct sctp_cookie_preserve_param { | 283 | typedef struct sctp_cookie_preserve_param { |
284 | sctp_paramhdr_t param_hdr; | 284 | sctp_paramhdr_t param_hdr; |
285 | __be32 lifespan_increment; | 285 | __be32 lifespan_increment; |
286 | } __attribute__((packed)) sctp_cookie_preserve_param_t; | 286 | } __packed sctp_cookie_preserve_param_t; |
287 | 287 | ||
288 | /* Section 3.3.2.1 Host Name Address (11) */ | 288 | /* Section 3.3.2.1 Host Name Address (11) */ |
289 | typedef struct sctp_hostname_param { | 289 | typedef struct sctp_hostname_param { |
290 | sctp_paramhdr_t param_hdr; | 290 | sctp_paramhdr_t param_hdr; |
291 | uint8_t hostname[0]; | 291 | uint8_t hostname[0]; |
292 | } __attribute__((packed)) sctp_hostname_param_t; | 292 | } __packed sctp_hostname_param_t; |
293 | 293 | ||
294 | /* Section 3.3.2.1 Supported Address Types (12) */ | 294 | /* Section 3.3.2.1 Supported Address Types (12) */ |
295 | typedef struct sctp_supported_addrs_param { | 295 | typedef struct sctp_supported_addrs_param { |
296 | sctp_paramhdr_t param_hdr; | 296 | sctp_paramhdr_t param_hdr; |
297 | __be16 types[0]; | 297 | __be16 types[0]; |
298 | } __attribute__((packed)) sctp_supported_addrs_param_t; | 298 | } __packed sctp_supported_addrs_param_t; |
299 | 299 | ||
300 | /* Appendix A. ECN Capable (32768) */ | 300 | /* Appendix A. ECN Capable (32768) */ |
301 | typedef struct sctp_ecn_capable_param { | 301 | typedef struct sctp_ecn_capable_param { |
302 | sctp_paramhdr_t param_hdr; | 302 | sctp_paramhdr_t param_hdr; |
303 | } __attribute__((packed)) sctp_ecn_capable_param_t; | 303 | } __packed sctp_ecn_capable_param_t; |
304 | 304 | ||
305 | /* ADDIP Section 3.2.6 Adaptation Layer Indication */ | 305 | /* ADDIP Section 3.2.6 Adaptation Layer Indication */ |
306 | typedef struct sctp_adaptation_ind_param { | 306 | typedef struct sctp_adaptation_ind_param { |
307 | struct sctp_paramhdr param_hdr; | 307 | struct sctp_paramhdr param_hdr; |
308 | __be32 adaptation_ind; | 308 | __be32 adaptation_ind; |
309 | } __attribute__((packed)) sctp_adaptation_ind_param_t; | 309 | } __packed sctp_adaptation_ind_param_t; |
310 | 310 | ||
311 | /* ADDIP Section 4.2.7 Supported Extensions Parameter */ | 311 | /* ADDIP Section 4.2.7 Supported Extensions Parameter */ |
312 | typedef struct sctp_supported_ext_param { | 312 | typedef struct sctp_supported_ext_param { |
313 | struct sctp_paramhdr param_hdr; | 313 | struct sctp_paramhdr param_hdr; |
314 | __u8 chunks[0]; | 314 | __u8 chunks[0]; |
315 | } __attribute__((packed)) sctp_supported_ext_param_t; | 315 | } __packed sctp_supported_ext_param_t; |
316 | 316 | ||
317 | /* AUTH Section 3.1 Random */ | 317 | /* AUTH Section 3.1 Random */ |
318 | typedef struct sctp_random_param { | 318 | typedef struct sctp_random_param { |
319 | sctp_paramhdr_t param_hdr; | 319 | sctp_paramhdr_t param_hdr; |
320 | __u8 random_val[0]; | 320 | __u8 random_val[0]; |
321 | } __attribute__((packed)) sctp_random_param_t; | 321 | } __packed sctp_random_param_t; |
322 | 322 | ||
323 | /* AUTH Section 3.2 Chunk List */ | 323 | /* AUTH Section 3.2 Chunk List */ |
324 | typedef struct sctp_chunks_param { | 324 | typedef struct sctp_chunks_param { |
325 | sctp_paramhdr_t param_hdr; | 325 | sctp_paramhdr_t param_hdr; |
326 | __u8 chunks[0]; | 326 | __u8 chunks[0]; |
327 | } __attribute__((packed)) sctp_chunks_param_t; | 327 | } __packed sctp_chunks_param_t; |
328 | 328 | ||
329 | /* AUTH Section 3.3 HMAC Algorithm */ | 329 | /* AUTH Section 3.3 HMAC Algorithm */ |
330 | typedef struct sctp_hmac_algo_param { | 330 | typedef struct sctp_hmac_algo_param { |
331 | sctp_paramhdr_t param_hdr; | 331 | sctp_paramhdr_t param_hdr; |
332 | __be16 hmac_ids[0]; | 332 | __be16 hmac_ids[0]; |
333 | } __attribute__((packed)) sctp_hmac_algo_param_t; | 333 | } __packed sctp_hmac_algo_param_t; |
334 | 334 | ||
335 | /* RFC 2960. Section 3.3.3 Initiation Acknowledgement (INIT ACK) (2): | 335 | /* RFC 2960. Section 3.3.3 Initiation Acknowledgement (INIT ACK) (2): |
336 | * The INIT ACK chunk is used to acknowledge the initiation of an SCTP | 336 | * The INIT ACK chunk is used to acknowledge the initiation of an SCTP |
@@ -342,13 +342,13 @@ typedef sctp_init_chunk_t sctp_initack_chunk_t; | |||
342 | typedef struct sctp_cookie_param { | 342 | typedef struct sctp_cookie_param { |
343 | sctp_paramhdr_t p; | 343 | sctp_paramhdr_t p; |
344 | __u8 body[0]; | 344 | __u8 body[0]; |
345 | } __attribute__((packed)) sctp_cookie_param_t; | 345 | } __packed sctp_cookie_param_t; |
346 | 346 | ||
347 | /* Section 3.3.3.1 Unrecognized Parameters (8) */ | 347 | /* Section 3.3.3.1 Unrecognized Parameters (8) */ |
348 | typedef struct sctp_unrecognized_param { | 348 | typedef struct sctp_unrecognized_param { |
349 | sctp_paramhdr_t param_hdr; | 349 | sctp_paramhdr_t param_hdr; |
350 | sctp_paramhdr_t unrecognized; | 350 | sctp_paramhdr_t unrecognized; |
351 | } __attribute__((packed)) sctp_unrecognized_param_t; | 351 | } __packed sctp_unrecognized_param_t; |
352 | 352 | ||
353 | 353 | ||
354 | 354 | ||
@@ -363,7 +363,7 @@ typedef struct sctp_unrecognized_param { | |||
363 | typedef struct sctp_gap_ack_block { | 363 | typedef struct sctp_gap_ack_block { |
364 | __be16 start; | 364 | __be16 start; |
365 | __be16 end; | 365 | __be16 end; |
366 | } __attribute__((packed)) sctp_gap_ack_block_t; | 366 | } __packed sctp_gap_ack_block_t; |
367 | 367 | ||
368 | typedef __be32 sctp_dup_tsn_t; | 368 | typedef __be32 sctp_dup_tsn_t; |
369 | 369 | ||
@@ -378,12 +378,12 @@ typedef struct sctp_sackhdr { | |||
378 | __be16 num_gap_ack_blocks; | 378 | __be16 num_gap_ack_blocks; |
379 | __be16 num_dup_tsns; | 379 | __be16 num_dup_tsns; |
380 | sctp_sack_variable_t variable[0]; | 380 | sctp_sack_variable_t variable[0]; |
381 | } __attribute__((packed)) sctp_sackhdr_t; | 381 | } __packed sctp_sackhdr_t; |
382 | 382 | ||
383 | typedef struct sctp_sack_chunk { | 383 | typedef struct sctp_sack_chunk { |
384 | sctp_chunkhdr_t chunk_hdr; | 384 | sctp_chunkhdr_t chunk_hdr; |
385 | sctp_sackhdr_t sack_hdr; | 385 | sctp_sackhdr_t sack_hdr; |
386 | } __attribute__((packed)) sctp_sack_chunk_t; | 386 | } __packed sctp_sack_chunk_t; |
387 | 387 | ||
388 | 388 | ||
389 | /* RFC 2960. Section 3.3.5 Heartbeat Request (HEARTBEAT) (4): | 389 | /* RFC 2960. Section 3.3.5 Heartbeat Request (HEARTBEAT) (4): |
@@ -395,12 +395,12 @@ typedef struct sctp_sack_chunk { | |||
395 | 395 | ||
396 | typedef struct sctp_heartbeathdr { | 396 | typedef struct sctp_heartbeathdr { |
397 | sctp_paramhdr_t info; | 397 | sctp_paramhdr_t info; |
398 | } __attribute__((packed)) sctp_heartbeathdr_t; | 398 | } __packed sctp_heartbeathdr_t; |
399 | 399 | ||
400 | typedef struct sctp_heartbeat_chunk { | 400 | typedef struct sctp_heartbeat_chunk { |
401 | sctp_chunkhdr_t chunk_hdr; | 401 | sctp_chunkhdr_t chunk_hdr; |
402 | sctp_heartbeathdr_t hb_hdr; | 402 | sctp_heartbeathdr_t hb_hdr; |
403 | } __attribute__((packed)) sctp_heartbeat_chunk_t; | 403 | } __packed sctp_heartbeat_chunk_t; |
404 | 404 | ||
405 | 405 | ||
406 | /* For the abort and shutdown ACK we must carry the init tag in the | 406 | /* For the abort and shutdown ACK we must carry the init tag in the |
@@ -409,7 +409,7 @@ typedef struct sctp_heartbeat_chunk { | |||
409 | */ | 409 | */ |
410 | typedef struct sctp_abort_chunk { | 410 | typedef struct sctp_abort_chunk { |
411 | sctp_chunkhdr_t uh; | 411 | sctp_chunkhdr_t uh; |
412 | } __attribute__((packed)) sctp_abort_chunk_t; | 412 | } __packed sctp_abort_chunk_t; |
413 | 413 | ||
414 | 414 | ||
415 | /* For the graceful shutdown we must carry the tag (in common header) | 415 | /* For the graceful shutdown we must carry the tag (in common header) |
@@ -417,12 +417,12 @@ typedef struct sctp_abort_chunk { | |||
417 | */ | 417 | */ |
418 | typedef struct sctp_shutdownhdr { | 418 | typedef struct sctp_shutdownhdr { |
419 | __be32 cum_tsn_ack; | 419 | __be32 cum_tsn_ack; |
420 | } __attribute__((packed)) sctp_shutdownhdr_t; | 420 | } __packed sctp_shutdownhdr_t; |
421 | 421 | ||
422 | struct sctp_shutdown_chunk_t { | 422 | struct sctp_shutdown_chunk_t { |
423 | sctp_chunkhdr_t chunk_hdr; | 423 | sctp_chunkhdr_t chunk_hdr; |
424 | sctp_shutdownhdr_t shutdown_hdr; | 424 | sctp_shutdownhdr_t shutdown_hdr; |
425 | } __attribute__ ((packed)); | 425 | } __packed; |
426 | 426 | ||
427 | /* RFC 2960. Section 3.3.10 Operation Error (ERROR) (9) */ | 427 | /* RFC 2960. Section 3.3.10 Operation Error (ERROR) (9) */ |
428 | 428 | ||
@@ -430,12 +430,12 @@ typedef struct sctp_errhdr { | |||
430 | __be16 cause; | 430 | __be16 cause; |
431 | __be16 length; | 431 | __be16 length; |
432 | __u8 variable[0]; | 432 | __u8 variable[0]; |
433 | } __attribute__((packed)) sctp_errhdr_t; | 433 | } __packed sctp_errhdr_t; |
434 | 434 | ||
435 | typedef struct sctp_operr_chunk { | 435 | typedef struct sctp_operr_chunk { |
436 | sctp_chunkhdr_t chunk_hdr; | 436 | sctp_chunkhdr_t chunk_hdr; |
437 | sctp_errhdr_t err_hdr; | 437 | sctp_errhdr_t err_hdr; |
438 | } __attribute__((packed)) sctp_operr_chunk_t; | 438 | } __packed sctp_operr_chunk_t; |
439 | 439 | ||
440 | /* RFC 2960 3.3.10 - Operation Error | 440 | /* RFC 2960 3.3.10 - Operation Error |
441 | * | 441 | * |
@@ -525,7 +525,7 @@ typedef struct sctp_ecnehdr { | |||
525 | typedef struct sctp_ecne_chunk { | 525 | typedef struct sctp_ecne_chunk { |
526 | sctp_chunkhdr_t chunk_hdr; | 526 | sctp_chunkhdr_t chunk_hdr; |
527 | sctp_ecnehdr_t ence_hdr; | 527 | sctp_ecnehdr_t ence_hdr; |
528 | } __attribute__((packed)) sctp_ecne_chunk_t; | 528 | } __packed sctp_ecne_chunk_t; |
529 | 529 | ||
530 | /* RFC 2960. Appendix A. Explicit Congestion Notification. | 530 | /* RFC 2960. Appendix A. Explicit Congestion Notification. |
531 | * Congestion Window Reduced (CWR) (13) | 531 | * Congestion Window Reduced (CWR) (13) |
@@ -537,7 +537,7 @@ typedef struct sctp_cwrhdr { | |||
537 | typedef struct sctp_cwr_chunk { | 537 | typedef struct sctp_cwr_chunk { |
538 | sctp_chunkhdr_t chunk_hdr; | 538 | sctp_chunkhdr_t chunk_hdr; |
539 | sctp_cwrhdr_t cwr_hdr; | 539 | sctp_cwrhdr_t cwr_hdr; |
540 | } __attribute__((packed)) sctp_cwr_chunk_t; | 540 | } __packed sctp_cwr_chunk_t; |
541 | 541 | ||
542 | /* PR-SCTP | 542 | /* PR-SCTP |
543 | * 3.2 Forward Cumulative TSN Chunk Definition (FORWARD TSN) | 543 | * 3.2 Forward Cumulative TSN Chunk Definition (FORWARD TSN) |
@@ -588,17 +588,17 @@ typedef struct sctp_cwr_chunk { | |||
588 | struct sctp_fwdtsn_skip { | 588 | struct sctp_fwdtsn_skip { |
589 | __be16 stream; | 589 | __be16 stream; |
590 | __be16 ssn; | 590 | __be16 ssn; |
591 | } __attribute__((packed)); | 591 | } __packed; |
592 | 592 | ||
593 | struct sctp_fwdtsn_hdr { | 593 | struct sctp_fwdtsn_hdr { |
594 | __be32 new_cum_tsn; | 594 | __be32 new_cum_tsn; |
595 | struct sctp_fwdtsn_skip skip[0]; | 595 | struct sctp_fwdtsn_skip skip[0]; |
596 | } __attribute((packed)); | 596 | } __packed; |
597 | 597 | ||
598 | struct sctp_fwdtsn_chunk { | 598 | struct sctp_fwdtsn_chunk { |
599 | struct sctp_chunkhdr chunk_hdr; | 599 | struct sctp_chunkhdr chunk_hdr; |
600 | struct sctp_fwdtsn_hdr fwdtsn_hdr; | 600 | struct sctp_fwdtsn_hdr fwdtsn_hdr; |
601 | } __attribute((packed)); | 601 | } __packed; |
602 | 602 | ||
603 | 603 | ||
604 | /* ADDIP | 604 | /* ADDIP |
@@ -636,17 +636,17 @@ struct sctp_fwdtsn_chunk { | |||
636 | typedef struct sctp_addip_param { | 636 | typedef struct sctp_addip_param { |
637 | sctp_paramhdr_t param_hdr; | 637 | sctp_paramhdr_t param_hdr; |
638 | __be32 crr_id; | 638 | __be32 crr_id; |
639 | } __attribute__((packed)) sctp_addip_param_t; | 639 | } __packed sctp_addip_param_t; |
640 | 640 | ||
641 | typedef struct sctp_addiphdr { | 641 | typedef struct sctp_addiphdr { |
642 | __be32 serial; | 642 | __be32 serial; |
643 | __u8 params[0]; | 643 | __u8 params[0]; |
644 | } __attribute__((packed)) sctp_addiphdr_t; | 644 | } __packed sctp_addiphdr_t; |
645 | 645 | ||
646 | typedef struct sctp_addip_chunk { | 646 | typedef struct sctp_addip_chunk { |
647 | sctp_chunkhdr_t chunk_hdr; | 647 | sctp_chunkhdr_t chunk_hdr; |
648 | sctp_addiphdr_t addip_hdr; | 648 | sctp_addiphdr_t addip_hdr; |
649 | } __attribute__((packed)) sctp_addip_chunk_t; | 649 | } __packed sctp_addip_chunk_t; |
650 | 650 | ||
651 | /* AUTH | 651 | /* AUTH |
652 | * Section 4.1 Authentication Chunk (AUTH) | 652 | * Section 4.1 Authentication Chunk (AUTH) |
@@ -701,11 +701,11 @@ typedef struct sctp_authhdr { | |||
701 | __be16 shkey_id; | 701 | __be16 shkey_id; |
702 | __be16 hmac_id; | 702 | __be16 hmac_id; |
703 | __u8 hmac[0]; | 703 | __u8 hmac[0]; |
704 | } __attribute__((packed)) sctp_authhdr_t; | 704 | } __packed sctp_authhdr_t; |
705 | 705 | ||
706 | typedef struct sctp_auth_chunk { | 706 | typedef struct sctp_auth_chunk { |
707 | sctp_chunkhdr_t chunk_hdr; | 707 | sctp_chunkhdr_t chunk_hdr; |
708 | sctp_authhdr_t auth_hdr; | 708 | sctp_authhdr_t auth_hdr; |
709 | } __attribute__((packed)) sctp_auth_chunk_t; | 709 | } __packed sctp_auth_chunk_t; |
710 | 710 | ||
711 | #endif /* __LINUX_SCTP_H__ */ | 711 | #endif /* __LINUX_SCTP_H__ */ |
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index bf243fc54959..122d08396e56 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -380,7 +380,10 @@ struct sk_buff { | |||
380 | kmemcheck_bitfield_begin(flags2); | 380 | kmemcheck_bitfield_begin(flags2); |
381 | __u16 queue_mapping:16; | 381 | __u16 queue_mapping:16; |
382 | #ifdef CONFIG_IPV6_NDISC_NODETYPE | 382 | #ifdef CONFIG_IPV6_NDISC_NODETYPE |
383 | __u8 ndisc_nodetype:2; | 383 | __u8 ndisc_nodetype:2, |
384 | deliver_no_wcard:1; | ||
385 | #else | ||
386 | __u8 deliver_no_wcard:1; | ||
384 | #endif | 387 | #endif |
385 | kmemcheck_bitfield_end(flags2); | 388 | kmemcheck_bitfield_end(flags2); |
386 | 389 | ||
@@ -2129,7 +2132,8 @@ static inline bool skb_warn_if_lro(const struct sk_buff *skb) | |||
2129 | /* LRO sets gso_size but not gso_type, whereas if GSO is really | 2132 | /* LRO sets gso_size but not gso_type, whereas if GSO is really |
2130 | * wanted then gso_type will be set. */ | 2133 | * wanted then gso_type will be set. */ |
2131 | struct skb_shared_info *shinfo = skb_shinfo(skb); | 2134 | struct skb_shared_info *shinfo = skb_shinfo(skb); |
2132 | if (shinfo->gso_size != 0 && unlikely(shinfo->gso_type == 0)) { | 2135 | if (skb_is_nonlinear(skb) && shinfo->gso_size != 0 && |
2136 | unlikely(shinfo->gso_type == 0)) { | ||
2133 | __skb_warn_lro_forwarding(skb); | 2137 | __skb_warn_lro_forwarding(skb); |
2134 | return true; | 2138 | return true; |
2135 | } | 2139 | } |
diff --git a/include/linux/snmp.h b/include/linux/snmp.h index 52797714ade7..ebb0c80ffd6e 100644 --- a/include/linux/snmp.h +++ b/include/linux/snmp.h | |||
@@ -229,6 +229,7 @@ enum | |||
229 | LINUX_MIB_TCPBACKLOGDROP, | 229 | LINUX_MIB_TCPBACKLOGDROP, |
230 | LINUX_MIB_TCPMINTTLDROP, /* RFC 5082 */ | 230 | LINUX_MIB_TCPMINTTLDROP, /* RFC 5082 */ |
231 | LINUX_MIB_TCPDEFERACCEPTDROP, | 231 | LINUX_MIB_TCPDEFERACCEPTDROP, |
232 | LINUX_MIB_IPRPFILTER, /* IP Reverse Path Filter (rp_filter) */ | ||
232 | __LINUX_MIB_MAX | 233 | __LINUX_MIB_MAX |
233 | }; | 234 | }; |
234 | 235 | ||
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h index a2608bff9c78..623b704fdc42 100644 --- a/include/linux/ssb/ssb.h +++ b/include/linux/ssb/ssb.h | |||
@@ -167,7 +167,7 @@ struct ssb_device { | |||
167 | * is an optimization. */ | 167 | * is an optimization. */ |
168 | const struct ssb_bus_ops *ops; | 168 | const struct ssb_bus_ops *ops; |
169 | 169 | ||
170 | struct device *dev; | 170 | struct device *dev, *dma_dev; |
171 | 171 | ||
172 | struct ssb_bus *bus; | 172 | struct ssb_bus *bus; |
173 | struct ssb_device_id id; | 173 | struct ssb_device_id id; |
@@ -470,14 +470,6 @@ extern u32 ssb_dma_translation(struct ssb_device *dev); | |||
470 | #define SSB_DMA_TRANSLATION_MASK 0xC0000000 | 470 | #define SSB_DMA_TRANSLATION_MASK 0xC0000000 |
471 | #define SSB_DMA_TRANSLATION_SHIFT 30 | 471 | #define SSB_DMA_TRANSLATION_SHIFT 30 |
472 | 472 | ||
473 | extern int ssb_dma_set_mask(struct ssb_device *dev, u64 mask); | ||
474 | |||
475 | extern void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size, | ||
476 | dma_addr_t *dma_handle, gfp_t gfp_flags); | ||
477 | extern void ssb_dma_free_consistent(struct ssb_device *dev, size_t size, | ||
478 | void *vaddr, dma_addr_t dma_handle, | ||
479 | gfp_t gfp_flags); | ||
480 | |||
481 | static inline void __cold __ssb_dma_not_implemented(struct ssb_device *dev) | 473 | static inline void __cold __ssb_dma_not_implemented(struct ssb_device *dev) |
482 | { | 474 | { |
483 | #ifdef CONFIG_SSB_DEBUG | 475 | #ifdef CONFIG_SSB_DEBUG |
@@ -486,155 +478,6 @@ static inline void __cold __ssb_dma_not_implemented(struct ssb_device *dev) | |||
486 | #endif /* DEBUG */ | 478 | #endif /* DEBUG */ |
487 | } | 479 | } |
488 | 480 | ||
489 | static inline int ssb_dma_mapping_error(struct ssb_device *dev, dma_addr_t addr) | ||
490 | { | ||
491 | switch (dev->bus->bustype) { | ||
492 | case SSB_BUSTYPE_PCI: | ||
493 | #ifdef CONFIG_SSB_PCIHOST | ||
494 | return pci_dma_mapping_error(dev->bus->host_pci, addr); | ||
495 | #endif | ||
496 | break; | ||
497 | case SSB_BUSTYPE_SSB: | ||
498 | return dma_mapping_error(dev->dev, addr); | ||
499 | default: | ||
500 | break; | ||
501 | } | ||
502 | __ssb_dma_not_implemented(dev); | ||
503 | return -ENOSYS; | ||
504 | } | ||
505 | |||
506 | static inline dma_addr_t ssb_dma_map_single(struct ssb_device *dev, void *p, | ||
507 | size_t size, enum dma_data_direction dir) | ||
508 | { | ||
509 | switch (dev->bus->bustype) { | ||
510 | case SSB_BUSTYPE_PCI: | ||
511 | #ifdef CONFIG_SSB_PCIHOST | ||
512 | return pci_map_single(dev->bus->host_pci, p, size, dir); | ||
513 | #endif | ||
514 | break; | ||
515 | case SSB_BUSTYPE_SSB: | ||
516 | return dma_map_single(dev->dev, p, size, dir); | ||
517 | default: | ||
518 | break; | ||
519 | } | ||
520 | __ssb_dma_not_implemented(dev); | ||
521 | return 0; | ||
522 | } | ||
523 | |||
524 | static inline void ssb_dma_unmap_single(struct ssb_device *dev, dma_addr_t dma_addr, | ||
525 | size_t size, enum dma_data_direction dir) | ||
526 | { | ||
527 | switch (dev->bus->bustype) { | ||
528 | case SSB_BUSTYPE_PCI: | ||
529 | #ifdef CONFIG_SSB_PCIHOST | ||
530 | pci_unmap_single(dev->bus->host_pci, dma_addr, size, dir); | ||
531 | return; | ||
532 | #endif | ||
533 | break; | ||
534 | case SSB_BUSTYPE_SSB: | ||
535 | dma_unmap_single(dev->dev, dma_addr, size, dir); | ||
536 | return; | ||
537 | default: | ||
538 | break; | ||
539 | } | ||
540 | __ssb_dma_not_implemented(dev); | ||
541 | } | ||
542 | |||
543 | static inline void ssb_dma_sync_single_for_cpu(struct ssb_device *dev, | ||
544 | dma_addr_t dma_addr, | ||
545 | size_t size, | ||
546 | enum dma_data_direction dir) | ||
547 | { | ||
548 | switch (dev->bus->bustype) { | ||
549 | case SSB_BUSTYPE_PCI: | ||
550 | #ifdef CONFIG_SSB_PCIHOST | ||
551 | pci_dma_sync_single_for_cpu(dev->bus->host_pci, dma_addr, | ||
552 | size, dir); | ||
553 | return; | ||
554 | #endif | ||
555 | break; | ||
556 | case SSB_BUSTYPE_SSB: | ||
557 | dma_sync_single_for_cpu(dev->dev, dma_addr, size, dir); | ||
558 | return; | ||
559 | default: | ||
560 | break; | ||
561 | } | ||
562 | __ssb_dma_not_implemented(dev); | ||
563 | } | ||
564 | |||
565 | static inline void ssb_dma_sync_single_for_device(struct ssb_device *dev, | ||
566 | dma_addr_t dma_addr, | ||
567 | size_t size, | ||
568 | enum dma_data_direction dir) | ||
569 | { | ||
570 | switch (dev->bus->bustype) { | ||
571 | case SSB_BUSTYPE_PCI: | ||
572 | #ifdef CONFIG_SSB_PCIHOST | ||
573 | pci_dma_sync_single_for_device(dev->bus->host_pci, dma_addr, | ||
574 | size, dir); | ||
575 | return; | ||
576 | #endif | ||
577 | break; | ||
578 | case SSB_BUSTYPE_SSB: | ||
579 | dma_sync_single_for_device(dev->dev, dma_addr, size, dir); | ||
580 | return; | ||
581 | default: | ||
582 | break; | ||
583 | } | ||
584 | __ssb_dma_not_implemented(dev); | ||
585 | } | ||
586 | |||
587 | static inline void ssb_dma_sync_single_range_for_cpu(struct ssb_device *dev, | ||
588 | dma_addr_t dma_addr, | ||
589 | unsigned long offset, | ||
590 | size_t size, | ||
591 | enum dma_data_direction dir) | ||
592 | { | ||
593 | switch (dev->bus->bustype) { | ||
594 | case SSB_BUSTYPE_PCI: | ||
595 | #ifdef CONFIG_SSB_PCIHOST | ||
596 | /* Just sync everything. That's all the PCI API can do. */ | ||
597 | pci_dma_sync_single_for_cpu(dev->bus->host_pci, dma_addr, | ||
598 | offset + size, dir); | ||
599 | return; | ||
600 | #endif | ||
601 | break; | ||
602 | case SSB_BUSTYPE_SSB: | ||
603 | dma_sync_single_range_for_cpu(dev->dev, dma_addr, offset, | ||
604 | size, dir); | ||
605 | return; | ||
606 | default: | ||
607 | break; | ||
608 | } | ||
609 | __ssb_dma_not_implemented(dev); | ||
610 | } | ||
611 | |||
612 | static inline void ssb_dma_sync_single_range_for_device(struct ssb_device *dev, | ||
613 | dma_addr_t dma_addr, | ||
614 | unsigned long offset, | ||
615 | size_t size, | ||
616 | enum dma_data_direction dir) | ||
617 | { | ||
618 | switch (dev->bus->bustype) { | ||
619 | case SSB_BUSTYPE_PCI: | ||
620 | #ifdef CONFIG_SSB_PCIHOST | ||
621 | /* Just sync everything. That's all the PCI API can do. */ | ||
622 | pci_dma_sync_single_for_device(dev->bus->host_pci, dma_addr, | ||
623 | offset + size, dir); | ||
624 | return; | ||
625 | #endif | ||
626 | break; | ||
627 | case SSB_BUSTYPE_SSB: | ||
628 | dma_sync_single_range_for_device(dev->dev, dma_addr, offset, | ||
629 | size, dir); | ||
630 | return; | ||
631 | default: | ||
632 | break; | ||
633 | } | ||
634 | __ssb_dma_not_implemented(dev); | ||
635 | } | ||
636 | |||
637 | |||
638 | #ifdef CONFIG_SSB_PCIHOST | 481 | #ifdef CONFIG_SSB_PCIHOST |
639 | /* PCI-host wrapper driver */ | 482 | /* PCI-host wrapper driver */ |
640 | extern int ssb_pcihost_register(struct pci_driver *driver); | 483 | extern int ssb_pcihost_register(struct pci_driver *driver); |
diff --git a/include/linux/wlp.h b/include/linux/wlp.h index ac95ce6606ac..c76fe2392506 100644 --- a/include/linux/wlp.h +++ b/include/linux/wlp.h | |||
@@ -300,7 +300,7 @@ struct wlp_ie { | |||
300 | __le16 cycle_param; | 300 | __le16 cycle_param; |
301 | __le16 acw_anchor_addr; | 301 | __le16 acw_anchor_addr; |
302 | u8 wssid_hash_list[]; | 302 | u8 wssid_hash_list[]; |
303 | } __attribute__((packed)); | 303 | } __packed; |
304 | 304 | ||
305 | static inline int wlp_ie_hash_length(struct wlp_ie *ie) | 305 | static inline int wlp_ie_hash_length(struct wlp_ie *ie) |
306 | { | 306 | { |
@@ -324,7 +324,7 @@ static inline void wlp_ie_set_hash_length(struct wlp_ie *ie, int hash_length) | |||
324 | */ | 324 | */ |
325 | struct wlp_nonce { | 325 | struct wlp_nonce { |
326 | u8 data[16]; | 326 | u8 data[16]; |
327 | } __attribute__((packed)); | 327 | } __packed; |
328 | 328 | ||
329 | /** | 329 | /** |
330 | * WLP UUID | 330 | * WLP UUID |
@@ -336,7 +336,7 @@ struct wlp_nonce { | |||
336 | */ | 336 | */ |
337 | struct wlp_uuid { | 337 | struct wlp_uuid { |
338 | u8 data[16]; | 338 | u8 data[16]; |
339 | } __attribute__((packed)); | 339 | } __packed; |
340 | 340 | ||
341 | 341 | ||
342 | /** | 342 | /** |
@@ -348,7 +348,7 @@ struct wlp_dev_type { | |||
348 | u8 OUI[3]; | 348 | u8 OUI[3]; |
349 | u8 OUIsubdiv; | 349 | u8 OUIsubdiv; |
350 | __le16 subID; | 350 | __le16 subID; |
351 | } __attribute__((packed)); | 351 | } __packed; |
352 | 352 | ||
353 | /** | 353 | /** |
354 | * WLP frame header | 354 | * WLP frame header |
@@ -357,7 +357,7 @@ struct wlp_dev_type { | |||
357 | struct wlp_frame_hdr { | 357 | struct wlp_frame_hdr { |
358 | __le16 mux_hdr; /* WLP_PROTOCOL_ID */ | 358 | __le16 mux_hdr; /* WLP_PROTOCOL_ID */ |
359 | enum wlp_frame_type type:8; | 359 | enum wlp_frame_type type:8; |
360 | } __attribute__((packed)); | 360 | } __packed; |
361 | 361 | ||
362 | /** | 362 | /** |
363 | * WLP attribute field header | 363 | * WLP attribute field header |
@@ -368,7 +368,7 @@ struct wlp_frame_hdr { | |||
368 | struct wlp_attr_hdr { | 368 | struct wlp_attr_hdr { |
369 | __le16 type; | 369 | __le16 type; |
370 | __le16 length; | 370 | __le16 length; |
371 | } __attribute__((packed)); | 371 | } __packed; |
372 | 372 | ||
373 | /** | 373 | /** |
374 | * Device information commonly used together | 374 | * Device information commonly used together |
@@ -401,13 +401,13 @@ struct wlp_device_info { | |||
401 | struct wlp_attr_##name { \ | 401 | struct wlp_attr_##name { \ |
402 | struct wlp_attr_hdr hdr; \ | 402 | struct wlp_attr_hdr hdr; \ |
403 | type name; \ | 403 | type name; \ |
404 | } __attribute__((packed)); | 404 | } __packed; |
405 | 405 | ||
406 | #define wlp_attr_array(type, name) \ | 406 | #define wlp_attr_array(type, name) \ |
407 | struct wlp_attr_##name { \ | 407 | struct wlp_attr_##name { \ |
408 | struct wlp_attr_hdr hdr; \ | 408 | struct wlp_attr_hdr hdr; \ |
409 | type name[]; \ | 409 | type name[]; \ |
410 | } __attribute__((packed)); | 410 | } __packed; |
411 | 411 | ||
412 | /** | 412 | /** |
413 | * WLP association attribute fields | 413 | * WLP association attribute fields |
@@ -483,7 +483,7 @@ struct wlp_wss_info { | |||
483 | struct wlp_attr_accept_enrl accept; | 483 | struct wlp_attr_accept_enrl accept; |
484 | struct wlp_attr_wss_sec_status sec_stat; | 484 | struct wlp_attr_wss_sec_status sec_stat; |
485 | struct wlp_attr_wss_bcast bcast; | 485 | struct wlp_attr_wss_bcast bcast; |
486 | } __attribute__((packed)); | 486 | } __packed; |
487 | 487 | ||
488 | /* WLP WSS Information */ | 488 | /* WLP WSS Information */ |
489 | wlp_attr_array(struct wlp_wss_info, wss_info) | 489 | wlp_attr_array(struct wlp_wss_info, wss_info) |
@@ -520,7 +520,7 @@ wlp_attr(u8, wlp_assc_err) | |||
520 | struct wlp_frame_std_abbrv_hdr { | 520 | struct wlp_frame_std_abbrv_hdr { |
521 | struct wlp_frame_hdr hdr; | 521 | struct wlp_frame_hdr hdr; |
522 | u8 tag; | 522 | u8 tag; |
523 | } __attribute__((packed)); | 523 | } __packed; |
524 | 524 | ||
525 | /** | 525 | /** |
526 | * WLP association frames | 526 | * WLP association frames |
@@ -533,7 +533,7 @@ struct wlp_frame_assoc { | |||
533 | struct wlp_attr_version version; | 533 | struct wlp_attr_version version; |
534 | struct wlp_attr_msg_type msg_type; | 534 | struct wlp_attr_msg_type msg_type; |
535 | u8 attr[]; | 535 | u8 attr[]; |
536 | } __attribute__((packed)); | 536 | } __packed; |
537 | 537 | ||
538 | /* Ethernet to dev address mapping */ | 538 | /* Ethernet to dev address mapping */ |
539 | struct wlp_eda { | 539 | struct wlp_eda { |