diff options
Diffstat (limited to 'net/atm')
-rw-r--r-- | net/atm/clip.c | 4 | ||||
-rw-r--r-- | net/atm/common.c | 2 | ||||
-rw-r--r-- | net/atm/lec.c | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/net/atm/clip.c b/net/atm/clip.c index 95fdd1185067..ff956d1115bc 100644 --- a/net/atm/clip.c +++ b/net/atm/clip.c | |||
@@ -310,9 +310,9 @@ static int clip_constructor(struct neighbour *neigh) | |||
310 | return 0; | 310 | return 0; |
311 | } | 311 | } |
312 | 312 | ||
313 | static u32 clip_hash(const void *pkey, const struct net_device *dev) | 313 | static u32 clip_hash(const void *pkey, const struct net_device *dev, __u32 rnd) |
314 | { | 314 | { |
315 | return jhash_2words(*(u32 *) pkey, dev->ifindex, clip_tbl.hash_rnd); | 315 | return jhash_2words(*(u32 *) pkey, dev->ifindex, rnd); |
316 | } | 316 | } |
317 | 317 | ||
318 | static struct neigh_table clip_tbl = { | 318 | static struct neigh_table clip_tbl = { |
diff --git a/net/atm/common.c b/net/atm/common.c index 940404a73b3d..1b9c52a02cd3 100644 --- a/net/atm/common.c +++ b/net/atm/common.c | |||
@@ -792,7 +792,7 @@ int vcc_getsockopt(struct socket *sock, int level, int optname, | |||
792 | default: | 792 | default: |
793 | if (level == SOL_SOCKET) | 793 | if (level == SOL_SOCKET) |
794 | return -EINVAL; | 794 | return -EINVAL; |
795 | break; | 795 | break; |
796 | } | 796 | } |
797 | if (!vcc->dev || !vcc->dev->ops->getsockopt) | 797 | if (!vcc->dev || !vcc->dev->ops->getsockopt) |
798 | return -EINVAL; | 798 | return -EINVAL; |
diff --git a/net/atm/lec.c b/net/atm/lec.c index d98bde1a0ac8..181d70c73d70 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c | |||
@@ -220,7 +220,6 @@ static unsigned char *get_tr_dst(unsigned char *packet, unsigned char *rdesc) | |||
220 | static int lec_open(struct net_device *dev) | 220 | static int lec_open(struct net_device *dev) |
221 | { | 221 | { |
222 | netif_start_queue(dev); | 222 | netif_start_queue(dev); |
223 | memset(&dev->stats, 0, sizeof(struct net_device_stats)); | ||
224 | 223 | ||
225 | return 0; | 224 | return 0; |
226 | } | 225 | } |