aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rtl818x/rtl8180_dev.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-08-06 16:30:43 -0400
committerDavid S. Miller <davem@davemloft.net>2010-08-06 16:30:43 -0400
commite225567960db50e9810a152c8621c7a6ed94de71 (patch)
treed0129e2988f8aea56d4f00f04c4818c2e8cc07a2 /drivers/net/wireless/rtl818x/rtl8180_dev.c
parent4b030d4288a569d6bdeca884d7f102d951f097f2 (diff)
parenta24d52f390a77ce90dc8cf0cd75d27ec0a6ea3f8 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/rtl818x/rtl8180_dev.c')
-rw-r--r--drivers/net/wireless/rtl818x/rtl8180_dev.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/rtl818x/rtl8180_dev.c b/drivers/net/wireless/rtl818x/rtl8180_dev.c
index 1d8178563d7..b50c39aaec0 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180_dev.c
@@ -695,6 +695,8 @@ static void rtl8180_beacon_work(struct work_struct *work)
695 695
696 /* grab a fresh beacon */ 696 /* grab a fresh beacon */
697 skb = ieee80211_beacon_get(dev, vif); 697 skb = ieee80211_beacon_get(dev, vif);
698 if (!skb)
699 goto resched;
698 700
699 /* 701 /*
700 * update beacon timestamp w/ TSF value 702 * update beacon timestamp w/ TSF value