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

Commit e89970aa 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:
  netfilter: nf_conntrack_sctp: fix sparse warnings
  netfilter: nf_nat_sip: c= is optional for session
  netfilter: xt_TCPMSS: collapse tcpmss_reverse_mtu{4,6} into one function
  netfilter: nfnetlink_log: send complete hardware header
  netfilter: xt_time: fix time's time_mt()'s use of do_div()
  netfilter: accounting rework: ct_extend + 64bit counters (v4)
  netlink: add NLA_PUT_BE64 macro
  netfilter: nf_nat_core: eliminate useless find_appropriate_src for IP_NAT_RANGE_PROTO_RANDOM
  hdlcdrv: Fix CRC calculation.
  Revert "pkt_sched: Make default qdisc nonshared-multiqueue safe."
  net: In __netif_schedule() use WARN_ON instead of BUG_ON
  net: Improve simple_tx_hash().
  pkt_sched: Remove unused variable skb in dev_deactivate_queue function.
  sunhme: Remove stop/wake TX queue calls in set-multicast-list handler.
  ucc_geth: do not touch net queue in adjust_link phylib callback
  gianfar: do not touch net queue in adjust_link phylib callback
  atl1: Do not wake queue before queue has been started.
parents 443bd1c4 5547cd0a

Documentation/feature-removal-schedule.txt

+10 −0
Original line number Original line Diff line number Diff line
@@ -336,3 +336,13 @@ When: After the only user (hal) has seen a release with the patches 
Why:	Over 1K .text/.data size reduction, data is available in other

Why:	Over 1K .text/.data size reduction, data is available in other

	ways (ioctls)

	ways (ioctls)

Who:	Johannes Berg <johannes@sipsolutions.net>

Who:	Johannes Berg <johannes@sipsolutions.net>



---------------------------



What: CONFIG_NF_CT_ACCT

When: 2.6.29

Why:  Accounting can now be enabled/disabled without kernel recompilation.

      Currently used only to set a default value for a feature that is also

      controlled by a kernel/module/sysfs/sysctl parameter.

Who:  Krzysztof Piotr Oledzki <ole@ans.pl>

Documentation/kernel-parameters.txt

+7 −0
Original line number Original line Diff line number Diff line
@@ -1279,6 +1279,13 @@ and is between 256 and 4096 characters. It is defined in the file 
			This usage is only documented in each driver source

			This usage is only documented in each driver source

			file if at all.

			file if at all.





	nf_conntrack.acct=

			[NETFILTER] Enable connection tracking flow accounting

			0 to disable accounting

			1 to enable accounting

			Default value depends on CONFIG_NF_CT_ACCT that is

			going to be removed in 2.6.29.



	nfsaddrs=	[NFS]

	nfsaddrs=	[NFS]

			See Documentation/filesystems/nfsroot.txt.

			See Documentation/filesystems/nfsroot.txt.

drivers/net/atlx/atl1.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1308,7 +1308,6 @@ static u32 atl1_check_link(struct atl1_adapter *adapter) 
				dev_info(&adapter->pdev->dev, "link is down\n");

				dev_info(&adapter->pdev->dev, "link is down\n");

			adapter->link_speed = SPEED_0;

			adapter->link_speed = SPEED_0;

			netif_carrier_off(netdev);

			netif_carrier_off(netdev);

			netif_stop_queue(netdev);

		}

		}

		return 0;

		return 0;

	}

	}
@@ -1358,7 +1357,6 @@ static u32 atl1_check_link(struct atl1_adapter *adapter) 
		if (!netif_carrier_ok(netdev)) {

		if (!netif_carrier_ok(netdev)) {

			/* Link down -> Up */

			/* Link down -> Up */

			netif_carrier_on(netdev);

			netif_carrier_on(netdev);

			netif_wake_queue(netdev);

		}

		}

		return 0;

		return 0;

	}

	}
@@ -2627,6 +2625,7 @@ static s32 atl1_up(struct atl1_adapter *adapter) 
	mod_timer(&adapter->watchdog_timer, jiffies);

	mod_timer(&adapter->watchdog_timer, jiffies);

	atlx_irq_enable(adapter);

	atlx_irq_enable(adapter);

	atl1_check_link(adapter);

	atl1_check_link(adapter);

	netif_start_queue(netdev);

	return 0;

	return 0;





err_up:

err_up:

drivers/net/gianfar.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -1725,7 +1725,6 @@ static void adjust_link(struct net_device *dev) 
		if (!priv->oldlink) {

		if (!priv->oldlink) {

			new_state = 1;

			new_state = 1;

			priv->oldlink = 1;

			priv->oldlink = 1;

			netif_tx_schedule_all(dev);

		}

		}

	} else if (priv->oldlink) {

	} else if (priv->oldlink) {

		new_state = 1;

		new_state = 1;

drivers/net/hamradio/hdlcdrv.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -88,6 +88,7 @@ 
static inline void append_crc_ccitt(unsigned char *buffer, int len)

static inline void append_crc_ccitt(unsigned char *buffer, int len)

{

{

 	unsigned int crc = crc_ccitt(0xffff, buffer, len) ^ 0xffff;

 	unsigned int crc = crc_ccitt(0xffff, buffer, len) ^ 0xffff;

	buffer += len;

	*buffer++ = crc;

	*buffer++ = crc;

	*buffer++ = crc >> 8;

	*buffer++ = crc >> 8;

}

}