diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 23:49:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 23:49:51 -0400 |
| commit | 5af43c24ca59a448c9312dd4a4a51d27ec3b9a73 (patch) | |
| tree | 65288caabc91fc04242acace38789a6dd5b86ed4 /drivers/net | |
| parent | 9affd6becbfb2c3f0d04e554bb87234761b37aba (diff) | |
| parent | a27bb332c04cec8c4afd7912df0dc7890db27560 (diff) | |
Merge branch 'akpm' (incoming from Andrew)
Merge more incoming from Andrew Morton:
- Various fixes which were stalled or which I picked up recently
- A large rotorooting of the AIO code. Allegedly to improve
performance but I don't really have good performance numbers (I might
have lost the email) and I can't raise Kent today. I held this out
of 3.9 and we could give it another cycle if it's all too late/scary.
I ended up taking only the first two thirds of the AIO rotorooting. I
left the percpu parts and the batch completion for later. - Linus
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (33 commits)
aio: don't include aio.h in sched.h
aio: kill ki_retry
aio: kill ki_key
aio: give shared kioctx fields their own cachelines
aio: kill struct aio_ring_info
aio: kill batch allocation
aio: change reqs_active to include unreaped completions
aio: use cancellation list lazily
aio: use flush_dcache_page()
aio: make aio_read_evt() more efficient, convert to hrtimers
wait: add wait_event_hrtimeout()
aio: refcounting cleanup
aio: make aio_put_req() lockless
aio: do fget() after aio_get_req()
aio: dprintk() -> pr_debug()
aio: move private stuff out of aio.h
aio: add kiocb_cancel()
aio: kill return value of aio_complete()
char: add aio_{read,write} to /dev/{null,zero}
aio: remove retry-based AIO
...
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/broadcom/cnic.c | 4 | ||||
| -rw-r--r-- | drivers/net/hamradio/baycom_epp.c | 2 | ||||
| -rw-r--r-- | drivers/net/hamradio/hdlcdrv.c | 2 | ||||
| -rw-r--r-- | drivers/net/hamradio/yam.c | 2 | ||||
| -rw-r--r-- | drivers/net/team/team_mode_random.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/mwifiex/cfg80211.c | 4 |
7 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c index 40649a8bf390..6b0dc131b20e 100644 --- a/drivers/net/ethernet/broadcom/cnic.c +++ b/drivers/net/ethernet/broadcom/cnic.c | |||
| @@ -4085,7 +4085,7 @@ static int cnic_cm_alloc_mem(struct cnic_dev *dev) | |||
| 4085 | if (!cp->csk_tbl) | 4085 | if (!cp->csk_tbl) |
| 4086 | return -ENOMEM; | 4086 | return -ENOMEM; |
| 4087 | 4087 | ||
| 4088 | port_id = random32(); | 4088 | port_id = prandom_u32(); |
| 4089 | port_id %= CNIC_LOCAL_PORT_RANGE; | 4089 | port_id %= CNIC_LOCAL_PORT_RANGE; |
| 4090 | if (cnic_init_id_tbl(&cp->csk_port_tbl, CNIC_LOCAL_PORT_RANGE, | 4090 | if (cnic_init_id_tbl(&cp->csk_port_tbl, CNIC_LOCAL_PORT_RANGE, |
| 4091 | CNIC_LOCAL_PORT_MIN, port_id)) { | 4091 | CNIC_LOCAL_PORT_MIN, port_id)) { |
| @@ -4145,7 +4145,7 @@ static int cnic_cm_init_bnx2_hw(struct cnic_dev *dev) | |||
| 4145 | { | 4145 | { |
| 4146 | u32 seed; | 4146 | u32 seed; |
| 4147 | 4147 | ||
| 4148 | seed = random32(); | 4148 | seed = prandom_u32(); |
| 4149 | cnic_ctx_wr(dev, 45, 0, seed); | 4149 | cnic_ctx_wr(dev, 45, 0, seed); |
| 4150 | return 0; | 4150 | return 0; |
| 4151 | } | 4151 | } |
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c index 49b8b58fc5c6..484f77ec2ce1 100644 --- a/drivers/net/hamradio/baycom_epp.c +++ b/drivers/net/hamradio/baycom_epp.c | |||
| @@ -449,7 +449,7 @@ static int transmit(struct baycom_state *bc, int cnt, unsigned char stat) | |||
| 449 | if ((--bc->hdlctx.slotcnt) > 0) | 449 | if ((--bc->hdlctx.slotcnt) > 0) |
| 450 | return 0; | 450 | return 0; |
| 451 | bc->hdlctx.slotcnt = bc->ch_params.slottime; | 451 | bc->hdlctx.slotcnt = bc->ch_params.slottime; |
| 452 | if ((random32() % 256) > bc->ch_params.ppersist) | 452 | if ((prandom_u32() % 256) > bc->ch_params.ppersist) |
| 453 | return 0; | 453 | return 0; |
| 454 | } | 454 | } |
| 455 | } | 455 | } |
diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c index a4a3516b6bbf..3169252613fa 100644 --- a/drivers/net/hamradio/hdlcdrv.c +++ b/drivers/net/hamradio/hdlcdrv.c | |||
| @@ -389,7 +389,7 @@ void hdlcdrv_arbitrate(struct net_device *dev, struct hdlcdrv_state *s) | |||
| 389 | if ((--s->hdlctx.slotcnt) > 0) | 389 | if ((--s->hdlctx.slotcnt) > 0) |
| 390 | return; | 390 | return; |
| 391 | s->hdlctx.slotcnt = s->ch_params.slottime; | 391 | s->hdlctx.slotcnt = s->ch_params.slottime; |
| 392 | if ((random32() % 256) > s->ch_params.ppersist) | 392 | if ((prandom_u32() % 256) > s->ch_params.ppersist) |
| 393 | return; | 393 | return; |
| 394 | start_tx(dev, s); | 394 | start_tx(dev, s); |
| 395 | } | 395 | } |
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index b2d863f2ea42..0721e72f9299 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c | |||
| @@ -638,7 +638,7 @@ static void yam_arbitrate(struct net_device *dev) | |||
| 638 | yp->slotcnt = yp->slot / 10; | 638 | yp->slotcnt = yp->slot / 10; |
| 639 | 639 | ||
| 640 | /* is random > persist ? */ | 640 | /* is random > persist ? */ |
| 641 | if ((random32() % 256) > yp->pers) | 641 | if ((prandom_u32() % 256) > yp->pers) |
| 642 | return; | 642 | return; |
| 643 | 643 | ||
| 644 | yam_start_tx(dev, yp); | 644 | yam_start_tx(dev, yp); |
diff --git a/drivers/net/team/team_mode_random.c b/drivers/net/team/team_mode_random.c index 9eabfaa22f3e..5ca14d463ba7 100644 --- a/drivers/net/team/team_mode_random.c +++ b/drivers/net/team/team_mode_random.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | static u32 random_N(unsigned int N) | 19 | static u32 random_N(unsigned int N) |
| 20 | { | 20 | { |
| 21 | return reciprocal_divide(random32(), N); | 21 | return reciprocal_divide(prandom_u32(), N); |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | static bool rnd_transmit(struct team *team, struct sk_buff *skb) | 24 | static bool rnd_transmit(struct team *team, struct sk_buff *skb) |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c index 2b90da0d85f3..e7a1a4770996 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c | |||
| @@ -1117,7 +1117,7 @@ static void brcmf_p2p_afx_handler(struct work_struct *work) | |||
| 1117 | if (afx_hdl->is_listen && afx_hdl->my_listen_chan) | 1117 | if (afx_hdl->is_listen && afx_hdl->my_listen_chan) |
| 1118 | /* 100ms ~ 300ms */ | 1118 | /* 100ms ~ 300ms */ |
| 1119 | err = brcmf_p2p_discover_listen(p2p, afx_hdl->my_listen_chan, | 1119 | err = brcmf_p2p_discover_listen(p2p, afx_hdl->my_listen_chan, |
| 1120 | 100 * (1 + (random32() % 3))); | 1120 | 100 * (1 + prandom_u32() % 3)); |
| 1121 | else | 1121 | else |
| 1122 | err = brcmf_p2p_act_frm_search(p2p, afx_hdl->peer_listen_chan); | 1122 | err = brcmf_p2p_act_frm_search(p2p, afx_hdl->peer_listen_chan); |
| 1123 | 1123 | ||
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c index a0cb0770d319..d3c8ece980d8 100644 --- a/drivers/net/wireless/mwifiex/cfg80211.c +++ b/drivers/net/wireless/mwifiex/cfg80211.c | |||
| @@ -216,7 +216,7 @@ mwifiex_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, | |||
| 216 | mwifiex_form_mgmt_frame(skb, buf, len); | 216 | mwifiex_form_mgmt_frame(skb, buf, len); |
| 217 | mwifiex_queue_tx_pkt(priv, skb); | 217 | mwifiex_queue_tx_pkt(priv, skb); |
| 218 | 218 | ||
| 219 | *cookie = random32() | 1; | 219 | *cookie = prandom_u32() | 1; |
| 220 | cfg80211_mgmt_tx_status(wdev, *cookie, buf, len, true, GFP_ATOMIC); | 220 | cfg80211_mgmt_tx_status(wdev, *cookie, buf, len, true, GFP_ATOMIC); |
| 221 | 221 | ||
| 222 | wiphy_dbg(wiphy, "info: management frame transmitted\n"); | 222 | wiphy_dbg(wiphy, "info: management frame transmitted\n"); |
| @@ -271,7 +271,7 @@ mwifiex_cfg80211_remain_on_channel(struct wiphy *wiphy, | |||
| 271 | duration); | 271 | duration); |
| 272 | 272 | ||
| 273 | if (!ret) { | 273 | if (!ret) { |
| 274 | *cookie = random32() | 1; | 274 | *cookie = prandom_u32() | 1; |
| 275 | priv->roc_cfg.cookie = *cookie; | 275 | priv->roc_cfg.cookie = *cookie; |
| 276 | priv->roc_cfg.chan = *chan; | 276 | priv->roc_cfg.chan = *chan; |
| 277 | 277 | ||