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/driver.c | |
parent | dfe9a837987aacaffbce020fbf54d8e0afa4bde1 (diff) | |
parent | 7481806dcfd07e9a636155554f6f4b4fbd976381 (diff) | |
download | blackbird-op-linux-3f1f39c42b24d5c20eb593ce80b9c4d5ec1e2148.tar.gz blackbird-op-linux-3f1f39c42b24d5c20eb593ce80b9c4d5ec1e2148.zip |
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/driver.c')
-rw-r--r-- | drivers/net/wimax/i2400m/driver.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wimax/i2400m/driver.c b/drivers/net/wimax/i2400m/driver.c index 07a54bad237b..ef16c573bb22 100644 --- a/drivers/net/wimax/i2400m/driver.c +++ b/drivers/net/wimax/i2400m/driver.c @@ -62,6 +62,7 @@ * unregister_netdev() */ #include "i2400m.h" +#include <linux/etherdevice.h> #include <linux/wimax/i2400m.h> #include <linux/module.h> #include <linux/moduleparam.h> @@ -234,9 +235,6 @@ int i2400m_op_msg_from_user(struct wimax_dev *wimax_dev, result = PTR_ERR(ack_skb); if (IS_ERR(ack_skb)) goto error_msg_to_dev; - if (unlikely(i2400m->trace_msg_from_user)) - wimax_msg(&i2400m->wimax_dev, "trace", - msg_buf, msg_len, GFP_KERNEL); result = wimax_msg_send(&i2400m->wimax_dev, ack_skb); error_msg_to_dev: d_fnend(4, dev, "(wimax_dev %p [i2400m %p] msg_buf %p msg_len %zu " @@ -650,6 +648,7 @@ int i2400m_setup(struct i2400m *i2400m, enum i2400m_bri bm_flags) result = i2400m_read_mac_addr(i2400m); if (result < 0) goto error_read_mac_addr; + random_ether_addr(i2400m->src_mac_addr); result = register_netdev(net_dev); /* Okey dokey, bring it up */ if (result < 0) { |