From 2f0b879113fc393e6fae9970e64301c674d08982 Mon Sep 17 00:00:00 2001 From: dingtianhong Date: Wed, 17 Apr 2013 22:17:50 +0000 Subject: [PATCH] --- yaml --- r: 369373 b: refs/heads/master c: 53759be99772f39db5148a7066a768066592a1e7 h: refs/heads/master i: 369371: 80473b3a99117afd3a166bc391c61db6005ef379 v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 36384564a619..42efc57911b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3fb62c5d3fc1821f50c6003e582713857a520f6b +refs/heads/master: 53759be99772f39db5148a7066a768066592a1e7 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index fad4c385f7a1..8a3cb2c50fbf 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -200,7 +200,7 @@ static inline void rps_unlock(struct softnet_data *sd) } /* Device list insertion */ -static int list_netdevice(struct net_device *dev) +static void list_netdevice(struct net_device *dev) { struct net *net = dev_net(dev); @@ -214,8 +214,6 @@ static int list_netdevice(struct net_device *dev) write_unlock_bh(&dev_base_lock); dev_base_seq_inc(net); - - return 0; } /* Device list removal