Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c68cb23d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  [IPV4]: Fix ip command line processing.
  [VETH]: move veth.h to include/linux
  [NET] tc_nat: header install
  [TUNTAP]: Fix wrong debug message.
  [NETFILTER]: nf_conntrack_ipv4: fix module parameter compatibility
  mac80211: warn when receiving frames with unaligned data
  mac80211: round station cleanup timer
parents b50fd73b a6c05c3d

Documentation/nfsroot.txt

+1 −4
Original line number Diff line number Diff line
@@ -97,10 +97,6 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf> 
  autoconfiguration will take place.  The most common way to use this

  is "ip=dhcp".



  Note that "ip=off" is not the same thing as "ip=::::::off", because in

  the latter autoconfiguration will take place if any of DHCP, BOOTP or RARP

  are compiled in the kernel.



  <client-ip>	IP address of the client.



  		Default:  Determined using autoconfiguration.
@@ -150,6 +146,7 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf> 


                  off or none: don't use autoconfiguration

		  on or any:   use any protocol available in the kernel

			       (default)

		  dhcp:        use DHCP

		  bootp:       use BOOTP

		  rarp:        use RARP

drivers/net/tun.c

+1 −1
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file, 
			tun->flags &= ~TUN_PERSIST;



		DBG(KERN_INFO "%s: persist %s\n",

		    tun->dev->name, arg ? "disabled" : "enabled");

		    tun->dev->name, arg ? "enabled" : "disabled");

		break;



	case TUNSETOWNER:

drivers/net/veth.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


#include <net/dst.h>

#include <net/xfrm.h>

#include <net/veth.h>

#include <linux/veth.h>



#define DRV_NAME	"veth"

#define DRV_VERSION	"1.0"

include/linux/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ header-y += toshiba.h 
header-y += ultrasound.h

header-y += un.h

header-y += utime.h

header-y += veth.h

header-y += video_decoder.h

header-y += video_encoder.h

header-y += videotext.h

include/linux/tc_act/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ header-y += tc_gact.h 
header-y += tc_ipt.h

header-y += tc_mirred.h

header-y += tc_pedit.h

header-y += tc_nat.h