Commit ff3ea47c authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [BRIDGE]: fix locking and memory leak in br_add_bridge
  [IRDA]: Missing allocation result check in irlap_change_speed().
  [PPPOE]: Missing result check in __pppoe_xmit().
  [NET]: Eliminate unused /proc/sys/net/ethernet
  [NETCONSOLE]: Clean up initcall warning.
  [TCP]: Avoid skb_pull if possible when trimming head
parents a8c72504 36485707
...@@ -107,7 +107,7 @@ static int init_netconsole(void) ...@@ -107,7 +107,7 @@ static int init_netconsole(void)
if(!configured) { if(!configured) {
printk("netconsole: not configured, aborting\n"); printk("netconsole: not configured, aborting\n");
return -EINVAL; return 0;
} }
if(netpoll_setup(&np)) if(netpoll_setup(&np))
......
...@@ -861,6 +861,9 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb) ...@@ -861,6 +861,9 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb)
* give dev_queue_xmit something it can free. * give dev_queue_xmit something it can free.
*/ */
skb2 = skb_clone(skb, GFP_ATOMIC); skb2 = skb_clone(skb, GFP_ATOMIC);
if (skb2 == NULL)
goto abort;
} }
ph = (struct pppoe_hdr *) skb_push(skb2, sizeof(struct pppoe_hdr)); ph = (struct pppoe_hdr *) skb_push(skb2, sizeof(struct pppoe_hdr));
......
...@@ -300,25 +300,20 @@ int br_add_bridge(const char *name) ...@@ -300,25 +300,20 @@ int br_add_bridge(const char *name)
rtnl_lock(); rtnl_lock();
if (strchr(dev->name, '%')) { if (strchr(dev->name, '%')) {
ret = dev_alloc_name(dev, dev->name); ret = dev_alloc_name(dev, dev->name);
if (ret < 0) if (ret < 0) {
goto err1; free_netdev(dev);
goto out;
}
} }
ret = register_netdevice(dev); ret = register_netdevice(dev);
if (ret) if (ret)
goto err2; goto out;
ret = br_sysfs_addbr(dev); ret = br_sysfs_addbr(dev);
if (ret) if (ret)
goto err3; unregister_netdevice(dev);
rtnl_unlock(); out:
return 0;
err3:
unregister_netdev(dev);
err2:
free_netdev(dev);
err1:
rtnl_unlock(); rtnl_unlock();
return ret; return ret;
} }
......
...@@ -3,6 +3,5 @@ ...@@ -3,6 +3,5 @@
# #
obj-y += eth.o obj-y += eth.o
obj-$(CONFIG_SYSCTL) += sysctl_net_ether.o
obj-$(subst m,y,$(CONFIG_IPX)) += pe2.o obj-$(subst m,y,$(CONFIG_IPX)) += pe2.o
obj-$(subst m,y,$(CONFIG_ATALK)) += pe2.o obj-$(subst m,y,$(CONFIG_ATALK)) += pe2.o
/* -*- linux-c -*-
* sysctl_net_ether.c: sysctl interface to net Ethernet subsystem.
*
* Begun April 1, 1996, Mike Shaver.
* Added /proc/sys/net/ether directory entry (empty =) ). [MS]
*/
#include <linux/mm.h>
#include <linux/sysctl.h>
#include <linux/if_ether.h>
ctl_table ether_table[] = {
{0}
};
...@@ -642,7 +642,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss ...@@ -642,7 +642,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss
* eventually). The difference is that pulled data not copied, but * eventually). The difference is that pulled data not copied, but
* immediately discarded. * immediately discarded.
*/ */
static unsigned char *__pskb_trim_head(struct sk_buff *skb, int len) static void __pskb_trim_head(struct sk_buff *skb, int len)
{ {
int i, k, eat; int i, k, eat;
...@@ -667,7 +667,6 @@ static unsigned char *__pskb_trim_head(struct sk_buff *skb, int len) ...@@ -667,7 +667,6 @@ static unsigned char *__pskb_trim_head(struct sk_buff *skb, int len)
skb->tail = skb->data; skb->tail = skb->data;
skb->data_len -= len; skb->data_len -= len;
skb->len = skb->data_len; skb->len = skb->data_len;
return skb->tail;
} }
int tcp_trim_head(struct sock *sk, struct sk_buff *skb, u32 len) int tcp_trim_head(struct sock *sk, struct sk_buff *skb, u32 len)
...@@ -676,12 +675,11 @@ int tcp_trim_head(struct sock *sk, struct sk_buff *skb, u32 len) ...@@ -676,12 +675,11 @@ int tcp_trim_head(struct sock *sk, struct sk_buff *skb, u32 len)
pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
return -ENOMEM; return -ENOMEM;
if (len <= skb_headlen(skb)) { /* If len == headlen, we avoid __skb_pull to preserve alignment. */
if (unlikely(len < skb_headlen(skb)))
__skb_pull(skb, len); __skb_pull(skb, len);
} else { else
if (__pskb_trim_head(skb, len-skb_headlen(skb)) == NULL) __pskb_trim_head(skb, len - skb_headlen(skb));
return -ENOMEM;
}
TCP_SKB_CB(skb)->seq += len; TCP_SKB_CB(skb)->seq += len;
skb->ip_summed = CHECKSUM_HW; skb->ip_summed = CHECKSUM_HW;
......
...@@ -884,7 +884,8 @@ static void irlap_change_speed(struct irlap_cb *self, __u32 speed, int now) ...@@ -884,7 +884,8 @@ static void irlap_change_speed(struct irlap_cb *self, __u32 speed, int now)
if (now) { if (now) {
/* Send down empty frame to trigger speed change */ /* Send down empty frame to trigger speed change */
skb = dev_alloc_skb(0); skb = dev_alloc_skb(0);
irlap_queue_xmit(self, skb); if (skb)
irlap_queue_xmit(self, skb);
} }
} }
......
...@@ -37,14 +37,6 @@ struct ctl_table net_table[] = { ...@@ -37,14 +37,6 @@ struct ctl_table net_table[] = {
.mode = 0555, .mode = 0555,
.child = core_table, .child = core_table,
}, },
#ifdef CONFIG_NET
{
.ctl_name = NET_ETHER,
.procname = "ethernet",
.mode = 0555,
.child = ether_table,
},
#endif
#ifdef CONFIG_INET #ifdef CONFIG_INET
{ {
.ctl_name = NET_IPV4, .ctl_name = NET_IPV4,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment