diff --git a/[refs] b/[refs] index d61f1ea525f7..7859143aad9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9d8b01978f6510a262ddc4da3b3694d5b149cfe +refs/heads/master: 0624760c96da3ffeaec8027a016475ae752d75e1 diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c index 9b13b8b24245..db343fa8033c 100644 --- a/trunk/net/mac80211/rx.c +++ b/trunk/net/mac80211/rx.c @@ -49,7 +49,7 @@ static struct sk_buff *remove_monitor_info(struct ieee80211_local *local, /* driver bug */ WARN_ON(1); dev_kfree_skb(skb); - skb = NULL; + return NULL; } }