[ALSA] sound/drivers/dummy.c: fix negative snd_pcm_format_width() check

[safe/jmp/linux-2.6] / include / linux / netfilter_bridge / ebt_arp.h

diff --git a/include/linux/netfilter_bridge/ebt_arp.h b/include/linux/netfilter_bridge/ebt_arp.h
index 537ec6b..cbf4843 100644 (file)
--- a/include/linux/netfilter_bridge/ebt_arp.h
+++ b/include/linux/netfilter_bridge/ebt_arp.h
@@ -8,19 +8,21 @@
 #define EBT_ARP_DST_IP 0x10
 #define EBT_ARP_SRC_MAC 0x20
 #define EBT_ARP_DST_MAC 0x40
+#define EBT_ARP_GRAT 0x80
 #define EBT_ARP_MASK (EBT_ARP_OPCODE | EBT_ARP_HTYPE | EBT_ARP_PTYPE | \
-   EBT_ARP_SRC_IP | EBT_ARP_DST_IP | EBT_ARP_SRC_MAC | EBT_ARP_DST_MAC)
+   EBT_ARP_SRC_IP | EBT_ARP_DST_IP | EBT_ARP_SRC_MAC | EBT_ARP_DST_MAC | \
+   EBT_ARP_GRAT)
 #define EBT_ARP_MATCH "arp"
 
 struct ebt_arp_info
 {
-       uint16_t htype;
-       uint16_t ptype;
-       uint16_t opcode;
-       uint32_t saddr;
-       uint32_t smsk;
-       uint32_t daddr;
-       uint32_t dmsk;
+       __be16 htype;
+       __be16 ptype;
+       __be16 opcode;
+       __be32 saddr;
+       __be32 smsk;
+       __be32 daddr;
+       __be32 dmsk;
        unsigned char smaddr[ETH_ALEN];
        unsigned char smmsk[ETH_ALEN];
        unsigned char dmaddr[ETH_ALEN];