diff options
| author | Grant Likely <grant.likely@linaro.org> | 2013-08-28 15:18:13 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2013-08-28 15:18:13 -0400 |
| commit | 8be137f2664f0abb096626a9d2ce0fcdd955b109 (patch) | |
| tree | 2c53a5535265a58eb397d6fbbab2ec26e92e6931 /drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | |
| parent | 8851b9f1625ce0858e9b1bb0ae4a57d4b43178b1 (diff) | |
| parent | d8dfad3876e4386666b759da3c833d62fb8b2267 (diff) | |
Merge tag 'v3.11-rc7' into devicetree/next
Linux 3.11-rc7
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index ee350bde1818..f2d1ff10054b 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | |||
| @@ -3117,7 +3117,7 @@ int bnx2x_poll(struct napi_struct *napi, int budget) | |||
| 3117 | return work_done; | 3117 | return work_done; |
| 3118 | } | 3118 | } |
| 3119 | 3119 | ||
| 3120 | #ifdef CONFIG_NET_LL_RX_POLL | 3120 | #ifdef CONFIG_NET_RX_BUSY_POLL |
| 3121 | /* must be called with local_bh_disable()d */ | 3121 | /* must be called with local_bh_disable()d */ |
| 3122 | int bnx2x_low_latency_recv(struct napi_struct *napi) | 3122 | int bnx2x_low_latency_recv(struct napi_struct *napi) |
| 3123 | { | 3123 | { |