Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-drm-fsl-dcu.git] / net / bridge / netfilter / ebt_802_3.c

diff --git a/net/bridge/netfilter/ebt_802_3.c b/net/bridge/netfilter/ebt_802_3.c
index d42f63f5e9f8cfdc738223dcc47c68fbb2b34a38..41a78072cd0eb1f4eed32752b2708ee6369788ee 100644 (file)
--- a/net/bridge/netfilter/ebt_802_3.c
+++ b/net/bridge/netfilter/ebt_802_3.c
@@ -5,7 +5,7 @@
  * Chris Vitale csv@bluetail.com
  *
  * May 2003
- * 
+ *
  */
 
 #include <linux/netfilter_bridge/ebtables.h>
@@ -17,10 +17,10 @@ static int ebt_filter_802_3(const struct sk_buff *skb, const struct net_device *
 {
        struct ebt_802_3_info *info = (struct ebt_802_3_info *)data;
        struct ebt_802_3_hdr *hdr = ebt_802_3_hdr(skb);
-       uint16_t type = hdr->llc.ui.ctrl & IS_UI ? hdr->llc.ui.type : hdr->llc.ni.type;
+       __be16 type = hdr->llc.ui.ctrl & IS_UI ? hdr->llc.ui.type : hdr->llc.ni.type;
 
        if (info->bitmask & EBT_802_3_SAP) {
-               if (FWINV(info->sap != hdr->llc.ui.ssap, EBT_802_3_SAP)) 
+               if (FWINV(info->sap != hdr->llc.ui.ssap, EBT_802_3_SAP))
                                return EBT_NOMATCH;
                if (FWINV(info->sap != hdr->llc.ui.dsap, EBT_802_3_SAP))
                                return EBT_NOMATCH;
@@ -29,7 +29,7 @@ static int ebt_filter_802_3(const struct sk_buff *skb, const struct net_device *
        if (info->bitmask & EBT_802_3_TYPE) {
                if (!(hdr->llc.ui.dsap == CHECK_TYPE && hdr->llc.ui.ssap == CHECK_TYPE))
                        return EBT_NOMATCH;
-               if (FWINV(info->type != type, EBT_802_3_TYPE)) 
+               if (FWINV(info->type != type, EBT_802_3_TYPE))
                        return EBT_NOMATCH;
        }