diff options
| author |   Stephen Hemminger <shemminger@linux-foundation.org> | 2007-11-19 19:23:29 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-01-28 14:54:17 -0800 |
| commit | 0953864160bdd28dfe45fd46fa462b4d2d53cb96 (patch) | |
| tree | fcc3be7c24858b4606d6eeafee2292a58d84c6a4 /net/core/netpoll.c | |
| parent | [NETPOLL]: netpoll_poll() cleanup (diff) | |
| download | linux-dev-0953864160bdd28dfe45fd46fa462b4d2d53cb96.tar.xz linux-dev-0953864160bdd28dfe45fd46fa462b4d2d53cb96.zip | |
[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) eth = (struct ethhdr *) skb_push(skb, ETH_HLEN); skb_reset_mac_header(skb); skb->protocol = eth->h_proto = htons(ETH_P_IP); - memcpy(eth->h_source, np->local_mac, 6); - memcpy(eth->h_dest, np->remote_mac, 6); + memcpy(eth->h_source, np->dev->dev_addr, ETH_ALEN); + memcpy(eth->h_dest, np->remote_mac, ETH_ALEN); skb->dev = np->dev; @@ -431,7 +431,7 @@ static void arp_reply(struct sk_buff *skb) /* Fill the device header for the ARP frame */ if (dev_hard_header(send_skb, skb->dev, ptype, - sha, np->local_mac, + sha, np->dev->dev_addr, send_skb->len) < 0) { kfree_skb(send_skb); return; @@ -737,9 +737,6 @@ int netpoll_setup(struct netpoll *np) } } - if (is_zero_ether_addr(np->local_mac) && ndev->dev_addr) - memcpy(np->local_mac, ndev->dev_addr, 6); - if (!np->local_ip) { rcu_read_lock(); in_dev = __in_dev_get_rcu(ndev); |