diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-16 02:14:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-16 02:14:16 -0400 |
| commit | 1cdc5abf40c561982d2f7b06bcff17f9496309a5 (patch) | |
| tree | 92c0ca1688929a6660dc41e97df203aef23b8c09 /net | |
| parent | e0f43752a942b7be1bc06b9fd74e20ae337c1cca (diff) | |
| parent | 0fb0a4f00aaf5de9f328273d7a46e3aa27dab496 (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wimax/stack.c b/net/wimax/stack.c index 1ed65dbdab03..62b1a6662209 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) | |||
| 315 | BUG(); | 315 | BUG(); |
| 316 | } | 316 | } |
| 317 | __wimax_state_set(wimax_dev, new_state); | 317 | __wimax_state_set(wimax_dev, new_state); |
| 318 | if (stch_skb) | 318 | if (!IS_ERR(stch_skb)) |
| 319 | wimax_gnl_re_state_change_send(wimax_dev, stch_skb, header); | 319 | wimax_gnl_re_state_change_send(wimax_dev, stch_skb, header); |
| 320 | out: | 320 | out: |
| 321 | d_fnend(3, dev, "(wimax_dev %p new_state %u [old %u]) = void\n", | 321 | d_fnend(3, dev, "(wimax_dev %p new_state %u [old %u]) = void\n", |