diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-11-19 22:23:29 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:54:17 -0500 |
commit | 0953864160bdd28dfe45fd46fa462b4d2d53cb96 (patch) | |
tree | fcc3be7c24858b4606d6eeafee2292a58d84c6a4 /net/core/netpoll.c | |
parent | 5106930bd6b57402205e3de54dae9476e215b622 (diff) |
[NETPOLL]: no need to store local_mac
The local_mac is managed by the network device, no need to keep a
spare copy and all the management problems that could cause.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/netpoll.c')
-rw-r--r-- | net/core/netpoll.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 250868f68762..cf6acd3084a4 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c | |||
@@ -360,8 +360,8 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len) | |||
360 | eth = (struct ethhdr *) skb_push(skb, ETH_HLEN); | 360 | eth = (struct ethhdr *) skb_push(skb, ETH_HLEN); |
361 | skb_reset_mac_header(skb); | 361 | skb_reset_mac_header(skb); |
362 | skb->protocol = eth->h_proto = htons(ETH_P_IP); | 362 | skb->protocol = eth->h_proto = htons(ETH_P_IP); |
363 | memcpy(eth->h_source, np->local_mac, 6); | 363 | memcpy(eth->h_source, np->dev->dev_addr, ETH_ALEN); |
364 | memcpy(eth->h_dest, np->remote_mac, 6); | 364 | memcpy(eth->h_dest, np->remote_mac, ETH_ALEN); |
365 | 365 | ||
366 | skb->dev = np->dev; | 366 | skb->dev = np->dev; |
367 | 367 | ||
@@ -431,7 +431,7 @@ static void arp_reply(struct sk_buff *skb) | |||
431 | 431 | ||
432 | /* Fill the device header for the ARP frame */ | 432 | /* Fill the device header for the ARP frame */ |
433 | if (dev_hard_header(send_skb, skb->dev, ptype, | 433 | if (dev_hard_header(send_skb, skb->dev, ptype, |
434 | sha, np->local_mac, | 434 | sha, np->dev->dev_addr, |
435 | send_skb->len) < 0) { | 435 | send_skb->len) < 0) { |
436 | kfree_skb(send_skb); | 436 | kfree_skb(send_skb); |
437 | return; | 437 | return; |
@@ -737,9 +737,6 @@ int netpoll_setup(struct netpoll *np) | |||
737 | } | 737 | } |
738 | } | 738 | } |
739 | 739 | ||
740 | if (is_zero_ether_addr(np->local_mac) && ndev->dev_addr) | ||
741 | memcpy(np->local_mac, ndev->dev_addr, 6); | ||
742 | |||
743 | if (!np->local_ip) { | 740 | if (!np->local_ip) { |
744 | rcu_read_lock(); | 741 | rcu_read_lock(); |
745 | in_dev = __in_dev_get_rcu(ndev); | 742 | in_dev = __in_dev_get_rcu(ndev); |