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/sfrench/cifs-2.6
[powerpc.git]
/
net
/
bridge
/
netfilter
/
ebt_arpreply.c
diff --git
a/net/bridge/netfilter/ebt_arpreply.c
b/net/bridge/netfilter/ebt_arpreply.c
index
0aa7b99
..
ffe468a
100644
(file)
--- a/
net/bridge/netfilter/ebt_arpreply.c
+++ b/
net/bridge/netfilter/ebt_arpreply.c
@@
-51,7
+51,7
@@
static int ebt_target_reply(struct sk_buff **pskb, unsigned int hooknr,
return EBT_DROP;
arp_send(ARPOP_REPLY, ETH_P_ARP, *siptr, (struct net_device *)in,
- *diptr, shp, info->mac, shp);
+ *diptr, shp, info->mac, shp);
return info->target;
}