diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-29 01:41:32 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-29 01:41:32 -0700 |
| commit | 3f1f39c42b24d5c20eb593ce80b9c4d5ec1e2148 (patch) | |
| tree | 785e5d697e9c2e4b8fd012a7e9c8aac263c186a5 /drivers/net/wimax/i2400m/netdev.c | |
| parent | dfe9a837987aacaffbce020fbf54d8e0afa4bde1 (diff) | |
| parent | 7481806dcfd07e9a636155554f6f4b4fbd976381 (diff) | |
Merge branch 'linux-2.6.31.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax
Diffstat (limited to 'drivers/net/wimax/i2400m/netdev.c')
| -rw-r--r-- | drivers/net/wimax/i2400m/netdev.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wimax/i2400m/netdev.c b/drivers/net/wimax/i2400m/netdev.c index 6b1fe7a81f2..9653f478b38 100644 --- a/drivers/net/wimax/i2400m/netdev.c +++ b/drivers/net/wimax/i2400m/netdev.c @@ -404,10 +404,12 @@ static void i2400m_rx_fake_eth_header(struct net_device *net_dev, void *_eth_hdr, __be16 protocol) { + struct i2400m *i2400m = net_dev_to_i2400m(net_dev); struct ethhdr *eth_hdr = _eth_hdr; memcpy(eth_hdr->h_dest, net_dev->dev_addr, sizeof(eth_hdr->h_dest)); - memset(eth_hdr->h_source, 0, sizeof(eth_hdr->h_dest)); + memcpy(eth_hdr->h_source, i2400m->src_mac_addr, + sizeof(eth_hdr->h_source)); eth_hdr->h_proto = protocol; } |