Commit 3dcbbcda 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: (160 commits)
  [ETHTOOL]: Remove some entries from non-root command list.
  [Bluetooth]: Fix section mismatch of bt_sysfs_cleanup()
  [Bluetooth]: Don't update disconnect timer for incoming connections
  [ETHTOOL]: let mortals use ethtool
  [NetLabel]: add audit support for configuration changes
  [TCP]: Fix and simplify microsecond rtt sampling
  [TCP] tcp-lp: prevent chance for oops
  [SUNRPC]: Remove unnecessary check in net/sunrpc/svcsock.c
  [IPVS] bug: endianness breakage in ip_vs_ftp
  [IPVS]: ipvs annotations
  [NETFILTER]: h323 annotations
  [NETFILTER]: ipt annotations
  [NETFILTER]: NAT annotations
  [NETFILTER]: conntrack annotations
  [NETFILTER]: netfilter misc annotations
  [NET]: Annotate dst_ops protocol
  [NET]: is it Andy or Andi ??
  [IPVS]: Make sure ip_vs_ftp ports are valid: module_param_array approach
  [IPVS]: Reverse valid ip_vs_ftp ports fix: port check approach
  [IrDA] stir4200: removing undocumented bits handling
  ...
parents c972398b 6fbe59b9

Documentation/networking/pktgen.txt

+16 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ Examples: 
                         are: IPSRC_RND #IP Source is random (between min/max),

                              IPDST_RND, UDPSRC_RND,

                              UDPDST_RND, MACSRC_RND, MACDST_RND 

                              MPLS_RND, VID_RND, SVID_RND



 pgset "udp_src_min 9"   set UDP source port min, If < udp_src_max, then

                         cycle through the port range.
@@ -125,6 +126,21 @@ Examples: 


 pgset "mpls 0"		  turn off mpls (or any invalid argument works too!)



 pgset "vlan_id 77"       set VLAN ID 0-4095

 pgset "vlan_p 3"         set priority bit 0-7 (default 0)

 pgset "vlan_cfi 0"       set canonical format identifier 0-1 (default 0)



 pgset "svlan_id 22"      set SVLAN ID 0-4095

 pgset "svlan_p 3"        set priority bit 0-7 (default 0)

 pgset "svlan_cfi 0"      set canonical format identifier 0-1 (default 0)



 pgset "vlan_id 9999"     > 4095 remove vlan and svlan tags

 pgset "svlan 9999"       > 4095 remove svlan tag





 pgset "tos XX"           set former IPv4 TOS field (e.g. "tos 28" for AF11 no ECN, default 00)

 pgset "traffic_class XX" set former IPv6 TRAFFIC CLASS (e.g. "traffic_class B8" for EF no ECN, default 00)



 pgset stop    	          aborts injection. Also, ^C aborts generator.

arch/ia64/hp/sim/simeth.c

+2 −2
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ simeth_device_event(struct notifier_block *this,unsigned long event, void *ptr) 
	}



	printk(KERN_INFO "simeth_device_event: %s ipaddr=0x%x\n",

	       dev->name, htonl(ifa->ifa_local));

	       dev->name, ntohl(ifa->ifa_local));



	/*

	 * XXX Fix me
@@ -331,7 +331,7 @@ simeth_device_event(struct notifier_block *this,unsigned long event, void *ptr) 
	local = dev->priv;

	/* now do it for real */

	r = event == NETDEV_UP ?

		netdev_attach(local->simfd, dev->irq, htonl(ifa->ifa_local)):

		netdev_attach(local->simfd, dev->irq, ntohl(ifa->ifa_local)):

		netdev_detach(local->simfd);



	printk(KERN_INFO "simeth: netdev_attach/detach: event=%s ->%d\n",

arch/um/drivers/net_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -825,7 +825,7 @@ int dev_netmask(void *d, void *m) 
	struct net_device *dev = d;

	struct in_device *ip = dev->ip_ptr;

	struct in_ifaddr *in;

	__u32 *mask_out = m;

	__be32 *mask_out = m;



	if(ip == NULL) 

		return(1);

arch/xtensa/platform-iss/network.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static void dev_ip_addr(void *d, char *buf, char *bin_buf) 
	struct net_device *dev = d;

	struct in_device *ip = dev->ip_ptr;

	struct in_ifaddr *in;

	u32 addr;

	__be32 addr;



	if ((ip == NULL) || ((in = ip->ifa_list) == NULL)) {

		printk(KERN_WARNING "Device not assigned an IP address!\n");

drivers/bluetooth/bfusb.c

+159 −157

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE