summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-05-15 23:14:16 -0700
committerDavid S. Miller <davem@davemloft.net>2010-05-15 23:14:16 -0700
commit1cdc5abf40c561982d2f7b06bcff17f9496309a5 (patch)
tree92c0ca1688929a6660dc41e97df203aef23b8c09 /net
parente0f43752a942b7be1bc06b9fd74e20ae337c1cca (diff)
parent0fb0a4f00aaf5de9f328273d7a46e3aa27dab496 (diff)
downloadlinux-3.10-1cdc5abf40c561982d2f7b06bcff17f9496309a5.tar.gz
linux-3.10-1cdc5abf40c561982d2f7b06bcff17f9496309a5.tar.bz2
linux-3.10-1cdc5abf40c561982d2f7b06bcff17f9496309a5.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax
Diffstat (limited to 'net')
-rw-r--r--net/wimax/stack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wimax/stack.c b/net/wimax/stack.c
index 1ed65dbdab0..62b1a666220 100644
--- a/net/wimax/stack.c
+++ b/net/wimax/stack.c
@@ -315,7 +315,7 @@ void __wimax_state_change(struct wimax_dev *wimax_dev, enum wimax_st new_state)
BUG();
}
__wimax_state_set(wimax_dev, new_state);
- if (stch_skb)
+ if (!IS_ERR(stch_skb))
wimax_gnl_re_state_change_send(wimax_dev, stch_skb, header);
out:
d_fnend(3, dev, "(wimax_dev %p new_state %u [old %u]) = void\n",