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

Commit 07ce198a 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: (60 commits)
  [NIU]: Bump driver version and release date.
  [NIU]: Fix BMAC alternate MAC address indexing.
  net: fix kernel-doc warnings in header files
  [IPV6]: Use BUG_ON instead of if + BUG in fib6_del_route.
  [IPV6]: dst_entry leak in ip4ip6_err. (resend)
  bluetooth: do not move child device other than rfcomm
  bluetooth: put hci dev after del conn
  [NET]: Elminate spurious print_mac() calls.
  [BLUETOOTH] hci_sysfs.c: Kill build warning.
  [NET]: Remove MAC_FMT
  net/8021q/vlan_dev.c: Use print_mac.
  [XFRM]: Fix ordering issue in xfrm_dst_hash_transfer().
  [BLUETOOTH] net/bluetooth/hci_core.c: Use time_* macros
  [IPV6]: Fix hardcoded removing of old module code
  [NETLABEL]: Move some initialization code into __init section.
  [NETLABEL]: Shrink the genl-ops registration code.
  [AX25] ax25_out: check skb for NULL in ax25_kick()
  [TCP]: Fix tcp_v4_send_synack() comment
  [IPV4]: fix alignment of IP-Config output
  Documentation: fix tcp.txt
  ...
parents 4bc87e62 a4425859

Documentation/networking/tcp.txt

+4 −4
Original line number Diff line number Diff line 
TCP protocol

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



Last updated: 21 June 2005

Last updated: 9 February 2008



Contents

========
@@ -52,9 +52,9 @@ research and RFC's before developing new modules. 
The method that is used to determine which congestion control mechanism is

determined by the setting of the sysctl net.ipv4.tcp_congestion_control.

The default congestion control will be the last one registered (LIFO);

so if you built everything as modules. the default will be reno. If you

build with the default's from Kconfig, then BIC will be builtin (not a module)

and it will end up the default.

so if you built everything as modules, the default will be reno. If you

build with the defaults from Kconfig, then CUBIC will be builtin (not a

module) and it will end up the default.



If you really want a particular default value then you will need

to set it with the sysctl.  If you use a sysctl, the module will be autoloaded

drivers/net/e1000/e1000_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ struct e1000_stats { 
	int stat_offset;

};



#define E1000_STAT(m) sizeof(((struct e1000_adapter *)0)->m), \

#define E1000_STAT(m) FIELD_SIZEOF(struct e1000_adapter, m), \

		      offsetof(struct e1000_adapter, m)

static const struct e1000_stats e1000_gstrings_stats[] = {

	{ "rx_packets", E1000_STAT(stats.gprc) },

drivers/net/e1000/e1000_main.c

+8 −0
Original line number Diff line number Diff line
@@ -1195,6 +1195,14 @@ e1000_probe(struct pci_dev *pdev, 


	printk("%s\n", print_mac(mac, netdev->dev_addr));



	if (adapter->hw.bus_type == e1000_bus_type_pci_express) {

		DPRINTK(PROBE, WARNING, "This device (id %04x:%04x) will no "

			"longer be supported by this driver in the future.\n",

			pdev->vendor, pdev->device);

		DPRINTK(PROBE, WARNING, "please use the \"e1000e\" "

			"driver instead.\n");

	}



	/* reset the hardware with the new settings */

	e1000_reset(adapter);

drivers/net/e1000e/netdev.c

+4 −30
Original line number Diff line number Diff line
@@ -1055,23 +1055,6 @@ static void e1000_release_hw_control(struct e1000_adapter *adapter) 
	}

}



static void e1000_release_manageability(struct e1000_adapter *adapter)

{

	if (adapter->flags & FLAG_MNG_PT_ENABLED) {

		struct e1000_hw *hw = &adapter->hw;



		u32 manc = er32(MANC);



		/* re-enable hardware interception of ARP */

		manc |= E1000_MANC_ARP_EN;

		manc &= ~E1000_MANC_EN_MNG2HOST;



		/* don't explicitly have to mess with MANC2H since

		 * MANC has an enable disable that gates MANC2H */

		ew32(MANC, manc);

	}

}



/**

 * @e1000_alloc_ring - allocate memory for a ring structure

 **/
@@ -1561,9 +1544,6 @@ static void e1000_init_manageability(struct e1000_adapter *adapter) 


	manc = er32(MANC);



	/* disable hardware interception of ARP */

	manc &= ~(E1000_MANC_ARP_EN);



	/* enable receiving management packets to the host. this will probably

	 * generate destination unreachable messages from the host OS, but

	 * the packets will be handled on SMBUS */
@@ -1690,6 +1670,9 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter) 
	else

		rctl |= E1000_RCTL_LPE;



	/* Enable hardware CRC frame stripping */

	rctl |= E1000_RCTL_SECRC;



	/* Setup buffer sizes */

	rctl &= ~E1000_RCTL_SZ_4096;

	rctl |= E1000_RCTL_BSEX;
@@ -1756,9 +1739,6 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter) 
		/* Enable Packet split descriptors */

		rctl |= E1000_RCTL_DTYP_PS;



		/* Enable hardware CRC frame stripping */

		rctl |= E1000_RCTL_SECRC;



		psrctl |= adapter->rx_ps_bsize0 >>

			E1000_PSRCTL_BSIZE0_SHIFT;
@@ -2008,7 +1988,7 @@ static void e1000_power_down_phy(struct e1000_adapter *adapter) 
	u16 mii_reg;



	/* WoL is enabled */

	if (!adapter->wol)

	if (adapter->wol)

		return;



	/* non-copper PHY? */
@@ -2140,8 +2120,6 @@ void e1000e_reset(struct e1000_adapter *adapter) 
		phy_data &= ~IGP02E1000_PM_SPD;

		e1e_wphy(hw, IGP02E1000_PHY_POWER_MGMT, phy_data);

	}



	e1000_release_manageability(adapter);

}



int e1000e_up(struct e1000_adapter *adapter)
@@ -3487,8 +3465,6 @@ static int e1000_suspend(struct pci_dev *pdev, pm_message_t state) 
		pci_enable_wake(pdev, PCI_D3cold, 0);

	}



	e1000_release_manageability(adapter);



	/* make sure adapter isn't asleep if manageability is enabled */

	if (adapter->flags & FLAG_MNG_PT_ENABLED) {

		pci_enable_wake(pdev, PCI_D3hot, 1);
@@ -4054,8 +4030,6 @@ static void __devexit e1000_remove(struct pci_dev *pdev) 


	flush_scheduled_work();



	e1000_release_manageability(adapter);



	/* Release control of h/w to f/w.  If f/w is AMT enabled, this

	 * would have already happened in close and is redundant. */

	e1000_release_hw_control(adapter);

drivers/net/gianfar.c

+2 −2
Original line number Diff line number Diff line
@@ -130,8 +130,8 @@ static void free_skb_resources(struct gfar_private *priv); 
static void gfar_set_multi(struct net_device *dev);

static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr);

static void gfar_configure_serdes(struct net_device *dev);

extern int gfar_local_mdio_write(struct gfar_mii *regs, int mii_id, int regnum, u16 value);

extern int gfar_local_mdio_read(struct gfar_mii *regs, int mii_id, int regnum);

extern int gfar_local_mdio_write(struct gfar_mii __iomem *regs, int mii_id, int regnum, u16 value);

extern int gfar_local_mdio_read(struct gfar_mii __iomem *regs, int mii_id, int regnum);

#ifdef CONFIG_GFAR_NAPI

static int gfar_poll(struct napi_struct *napi, int budget);

#endif