projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[powerpc.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
9abbc09
..
41a7807
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
* Chris Vitale csv@bluetail.com
*
* May 2003
- *
+ *
*/
#include <linux/netfilter_bridge/ebtables.h>
*/
#include <linux/netfilter_bridge/ebtables.h>
@@
-20,7
+20,7
@@
static int ebt_filter_802_3(const struct sk_buff *skb, const struct net_device *
__be16 type = hdr->llc.ui.ctrl & IS_UI ? hdr->llc.ui.type : hdr->llc.ni.type;
if (info->bitmask & EBT_802_3_SAP) {
__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;
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 (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;
}
return EBT_NOMATCH;
}