aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorimoseyon <imoseyon@gmail.com>2014-12-13 16:53:42 -0800
committerMister Oyster <oysterized@gmail.com>2017-05-24 02:20:21 +0200
commit94e3f4e87517064b4c92964ac0c8ad3d3cf19e74 (patch)
tree4797620c6cb4e981ca16ad1be40624a5027f698c
parent33b5c4110cbd5fe07a18f757f3c5bbdfec9002aa (diff)
net/packet: merge fix
-rw-r--r--net/packet/af_packet.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index cf2a0c6f5..69161d1b1 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1173,13 +1173,6 @@ static unsigned int fanout_demux_cpu(struct packet_fanout *f,
return smp_processor_id() % num;
}
-static unsigned int fanout_demux_rnd(struct packet_fanout *f,
- struct sk_buff *skb,
- unsigned int num)
-{
- return prandom_u32_max(num);
-}
-
static unsigned int fanout_demux_rollover(struct packet_fanout *f,
struct sk_buff *skb,
unsigned int idx, unsigned int skip,