Commit dbeb1701 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: (29 commits)
  tulip: fix 21142 with 10Mbps without negotiation
  drivers/net/skfp: if !capable(CAP_NET_ADMIN): inverted logic
  gianfar: Fix Wake-on-LAN support
  smsc911x: timeout reaches -1
  smsc9420: fix interrupt signalling test failures
  ucc_geth: Change uec phy id to the same format as gianfar's
  wimax: fix build issue when debugfs is disabled
  netxen: fix memory leak in drivers/net/netxen_nic_init.c
  tun: Add some missing TUN compat ioctl translations.
  ipv4: fix infinite retry loop in IP-Config
  net: update documentation ip aliases
  net: Fix OOPS in skb_seq_read().
  net: Fix frag_list handling in skb_seq_read
  netxen: revert jumbo ringsize
  ath5k: fix locking in ath5k_config
  cfg80211: print correct intersected regulatory domain
  cfg80211: Fix sanity check on 5 GHz when processing country IE
  iwlwifi: fix kernel oops when ucode DMA memory allocation failure
  rtl8187: Fix error in setting OFDM power settings for RTL8187L
  mac80211: remove Michael Wu as maintainer
  ...
parents 0461ec5b f99ec064

Documentation/networking/alias.txt

+6 −19
Original line number Original line Diff line number Diff line
@@ -2,13 +2,13 @@ 
IP-Aliasing:

IP-Aliasing:

============

============





IP-aliases are additional IP-addresses/masks hooked up to a base 

IP-aliases are an obsolete way to manage multiple IP-addresses/masks

interface by adding a colon and a string when running ifconfig. 

per interface. Newer tools such as iproute2 support multiple

This string is usually numeric, but this is not a must.

address/prefixes per interface, but aliases are still supported



for backwards compatibility.

IP-Aliases are avail if CONFIG_INET (`standard' IPv4 networking) 

is configured in the kernel.





An alias is formed by adding a colon and a string when running ifconfig.

This string is usually numeric, but this is not a must.





o Alias creation.

o Alias creation.

  Alias creation is done by 'magic' interface naming: eg. to create a

  Alias creation is done by 'magic' interface naming: eg. to create a
@@ -38,16 +38,3 @@ o Relationship with main device 




  If the base device is shut down the added aliases will be deleted 

  If the base device is shut down the added aliases will be deleted 

  too.
 
  too.
 




Contact

-------

Please finger or e-mail me:

   Juan Jose Ciarlante <jjciarla@raiz.uncu.edu.ar>



Updated by Erik Schoenfelder <schoenfr@gaertner.DE>



; local variables:

; mode: indented-text

; mode: auto-fill

; end:

MAINTAINERS

+0 −2
Original line number Original line Diff line number Diff line
@@ -2836,8 +2836,6 @@ S: Maintained 
MAC80211

MAC80211

P:	Johannes Berg

P:	Johannes Berg

M:	johannes@sipsolutions.net

M:	johannes@sipsolutions.net

P:	Michael Wu

M:	flamingice@sourmilk.net

L:	linux-wireless@vger.kernel.org

L:	linux-wireless@vger.kernel.org

W:	http://linuxwireless.org/

W:	http://linuxwireless.org/

T:	git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git

T:	git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git

drivers/net/e1000/e1000_main.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ 




char e1000_driver_name[] = "e1000";

char e1000_driver_name[] = "e1000";

static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";

static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";

#define DRV_VERSION "7.3.20-k3-NAPI"

#define DRV_VERSION "7.3.21-k3-NAPI"

const char e1000_driver_version[] = DRV_VERSION;

const char e1000_driver_version[] = DRV_VERSION;

static const char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation.";

static const char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation.";
@@ -3712,7 +3712,7 @@ static irqreturn_t e1000_intr(int irq, void *data) 
	struct e1000_hw *hw = &adapter->hw;

	struct e1000_hw *hw = &adapter->hw;

	u32 rctl, icr = er32(ICR);

	u32 rctl, icr = er32(ICR);





	if (unlikely(!icr))

	if (unlikely((!icr) || test_bit(__E1000_RESETTING, &adapter->flags)))

		return IRQ_NONE;  /* Not our interrupt */

		return IRQ_NONE;  /* Not our interrupt */





	/* IMS will not auto-mask if INT_ASSERTED is not set, and if it is

	/* IMS will not auto-mask if INT_ASSERTED is not set, and if it is

drivers/net/gianfar_mii.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -234,6 +234,8 @@ static int gfar_mdio_probe(struct of_device *ofdev, 
	if (NULL == new_bus)

	if (NULL == new_bus)

		return -ENOMEM;

		return -ENOMEM;





	device_init_wakeup(&ofdev->dev, 1);



	new_bus->name = "Gianfar MII Bus",

	new_bus->name = "Gianfar MII Bus",

	new_bus->read = &gfar_mdio_read,

	new_bus->read = &gfar_mdio_read,

	new_bus->write = &gfar_mdio_write,

	new_bus->write = &gfar_mdio_write,

drivers/net/netxen/netxen_nic.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -210,7 +210,7 @@ 
#define MAX_CMD_DESCRIPTORS_HOST	1024

#define MAX_CMD_DESCRIPTORS_HOST	1024

#define MAX_RCV_DESCRIPTORS_1G		2048

#define MAX_RCV_DESCRIPTORS_1G		2048

#define MAX_RCV_DESCRIPTORS_10G		4096

#define MAX_RCV_DESCRIPTORS_10G		4096

#define MAX_JUMBO_RCV_DESCRIPTORS	512

#define MAX_JUMBO_RCV_DESCRIPTORS	1024

#define MAX_LRO_RCV_DESCRIPTORS		8

#define MAX_LRO_RCV_DESCRIPTORS		8

#define MAX_RCVSTATUS_DESCRIPTORS	MAX_RCV_DESCRIPTORS

#define MAX_RCVSTATUS_DESCRIPTORS	MAX_RCV_DESCRIPTORS

#define MAX_JUMBO_RCV_DESC	MAX_JUMBO_RCV_DESCRIPTORS

#define MAX_JUMBO_RCV_DESC	MAX_JUMBO_RCV_DESCRIPTORS