diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/wimax/i2400m/netdev.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/wimax/i2400m/netdev.c')
| -rw-r--r-- | drivers/net/wimax/i2400m/netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wimax/i2400m/netdev.c b/drivers/net/wimax/i2400m/netdev.c index 94742e1eafe0..2edd8fe1c1f3 100644 --- a/drivers/net/wimax/i2400m/netdev.c +++ b/drivers/net/wimax/i2400m/netdev.c | |||
| @@ -166,7 +166,7 @@ void i2400m_wake_tx_work(struct work_struct *ws) | |||
| 166 | d_fnstart(3, dev, "(ws %p i2400m %p skb %p)\n", ws, i2400m, skb); | 166 | d_fnstart(3, dev, "(ws %p i2400m %p skb %p)\n", ws, i2400m, skb); |
| 167 | result = -EINVAL; | 167 | result = -EINVAL; |
| 168 | if (skb == NULL) { | 168 | if (skb == NULL) { |
| 169 | dev_err(dev, "WAKE&TX: skb dissapeared!\n"); | 169 | dev_err(dev, "WAKE&TX: skb disappeared!\n"); |
| 170 | goto out_put; | 170 | goto out_put; |
| 171 | } | 171 | } |
| 172 | /* If we have, somehow, lost the connection after this was | 172 | /* If we have, somehow, lost the connection after this was |