Commit 199f4c9f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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:
  [NET]: Require CAP_NET_ADMIN to create tuntap devices.
  [NET]: fix net-core kernel-doc
  [TCP]: Move inclusion of <linux/dmaengine.h> to correct place in <linux/tcp.h>
  [IPSEC]: Handle GSO packets
  [NET]: Added GSO toggle
  [NET]: Add software TSOv4
  [NET]: Add generic segmentation offload
  [NET]: Merge TSO/UFO fields in sk_buff
  [NET]: Prevent transmission after dev_deactivate
  [IPV6] ADDRCONF: Fix default source address selection without CONFIG_IPV6_PRIVACY
  [IPV6]: Fix source address selection.
  [NET]: Avoid allocating skb in skb_pad
parents 37224470 ca6bb5d7

Documentation/networking/tuntap.txt

+7 −4
Original line number Diff line number Diff line
@@ -39,10 +39,13 @@ Copyright (C) 1999-2000 Maxim Krasnyansky <max_mk@yahoo.com> 
     mknod /dev/net/tun c 10 200

  

  Set permissions:

     e.g. chmod 0700 /dev/net/tun

     if you want the device only accessible by root. Giving regular users the

     right to assign network devices is NOT a good idea. Users could assign

     bogus network interfaces to trick firewalls or administrators.

     e.g. chmod 0666 /dev/net/tun

     There's no harm in allowing the device to be accessible by non-root users,

     since CAP_NET_ADMIN is required for creating network devices or for 

     connecting to network devices which aren't owned by the user in question.

     If you want to create persistent devices and give ownership of them to 

     unprivileged users, then you need the /dev/net/tun device to be usable by

     those users.



  Driver module autoloading

drivers/net/3c527.c

+1 −2
Original line number Diff line number Diff line
@@ -1031,8 +1031,7 @@ static int mc32_send_packet(struct sk_buff *skb, struct net_device *dev) 
		return 1;

	}



	skb = skb_padto(skb, ETH_ZLEN);

	if (skb == NULL) {

	if (skb_padto(skb, ETH_ZLEN)) {

		netif_wake_queue(dev);

		return 0;

	}

drivers/net/8139cp.c

+1 −1
Original line number Diff line number Diff line
@@ -797,7 +797,7 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev) 
	entry = cp->tx_head;

	eor = (entry == (CP_TX_RING_SIZE - 1)) ? RingEnd : 0;

	if (dev->features & NETIF_F_TSO)

		mss = skb_shinfo(skb)->tso_size;

		mss = skb_shinfo(skb)->gso_size;



	if (skb_shinfo(skb)->nr_frags == 0) {

		struct cp_desc *txd = &cp->tx_ring[entry];

drivers/net/82596.c

+1 −2
Original line number Diff line number Diff line
@@ -1070,8 +1070,7 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev) 
				skb->len, (unsigned int)skb->data));



	if (skb->len < ETH_ZLEN) {

		skb = skb_padto(skb, ETH_ZLEN);

		if (skb == NULL)

		if (skb_padto(skb, ETH_ZLEN))

			return 0;

		length = ETH_ZLEN;

	}

drivers/net/a2065.c

+1 −2
Original line number Diff line number Diff line
@@ -573,8 +573,7 @@ static int lance_start_xmit (struct sk_buff *skb, struct net_device *dev) 
	

	if (len < ETH_ZLEN) {

		len = ETH_ZLEN;

		skb = skb_padto(skb, ETH_ZLEN);

		if (skb == NULL)

		if (skb_padto(skb, ETH_ZLEN))

			return 0;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE