diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-19 16:29:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-19 16:29:40 -0700 |
| commit | 44dc19c829c057dc78a5ffacaf851ac4c301eb58 (patch) | |
| tree | 7da34731e9dfaefaf14f9119158db864b7677a12 /drivers/net/wireless/libertas/main.c | |
| parent | 0686caa35ed17cf5b9043f453957e702a7eb588d (diff) | |
| parent | 229ce3abb6d6d4598de8ef1ed1e2da8163a9bbc0 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/libertas/main.c')
| -rw-r--r-- | drivers/net/wireless/libertas/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index 406f54d4095..e1f06606859 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c @@ -756,6 +756,7 @@ static int lbs_thread(void *data) priv->nr_retries = 0; } else { priv->cur_cmd = NULL; + priv->dnld_sent = DNLD_RES_RECEIVED; lbs_pr_info("requeueing command %x due to timeout (#%d)\n", le16_to_cpu(cmdnode->cmdbuf->command), priv->nr_retries); @@ -1564,6 +1565,7 @@ static int lbs_add_rtap(struct lbs_private *priv) rtap_dev->hard_start_xmit = lbs_rtap_hard_start_xmit; rtap_dev->set_multicast_list = lbs_set_multicast_list; rtap_dev->priv = priv; + SET_NETDEV_DEV(rtap_dev, priv->dev->dev.parent); ret = register_netdev(rtap_dev); if (ret) { |