Merge git://oss.sgi.com:8090/xfs/xfs-2.6

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

diff --git a/net/bridge/netfilter/ebt_arpreply.c b/net/bridge/netfilter/ebt_arpreply.c
index 0aa7b9910a86159a66043ba819298a02f6b917f1..ffe468a632e72c490c5344c2ac9db5850c82dd74 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;
 }