From 84d0c2ac43d5bb3aff6cda8f820dc2c33e057aee Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Fri, 15 Jan 2010 01:49:28 -0800 Subject: [PATCH] --- yaml --- r: 179783 b: refs/heads/master c: 2a04cd4c7d41c4549764734dcf5a883d304e3229 h: refs/heads/master i: 179781: cc9ef350cef1a25f8d50ca31fa93c4778d5927e0 179779: 35cfdb7dead0d35955a698c3556e1074202d9bd9 179775: 2f16a544d5d634dfb2f2c9efa0447464ca4c8a44 v: v3 --- [refs] | 2 +- trunk/net/appletalk/aarp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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; }