diff --git a/[refs] b/[refs] index efeae50867a0..4c2a8691df7c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fe3b691282691a46abbb25a1e0a8e5f96486d18 +refs/heads/master: 2a04cd4c7d41c4549764734dcf5a883d304e3229 diff --git a/trunk/net/appletalk/aarp.c b/trunk/net/appletalk/aarp.c index 9d4adfd22757..f2b3b56aa779 100644 --- a/trunk/net/appletalk/aarp.c +++ b/trunk/net/appletalk/aarp.c @@ -819,7 +819,7 @@ static int aarp_rcv(struct sk_buff *skb, struct net_device *dev, ma = &ifa->address; else { /* We need to make a copy of the entry. */ da.s_node = sa.s_node; - da.s_net = da.s_net; + da.s_net = sa.s_net; ma = &da; }