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

Commit 465de2ba 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: (25 commits)
  smc91c92_cs: define multicast_table as unsigned char
  can: avoids a false warning
  e1000e: stop cleaning when we reach tx_ring->next_to_use
  igb: restrict WoL for 82576 ET2 Quad Port Server Adapter
  virtio_net: missing sg_init_table
  Revert "tcp: Set CHECKSUM_UNNECESSARY in tcp_init_nondata_skb"
  iwlwifi: need check for valid qos packet before free
  tcp: Set CHECKSUM_UNNECESSARY in tcp_init_nondata_skb
  udp: fix for unicast RX path optimization
  myri10ge: fix rx_pause in myri10ge_set_pauseparam
  net: corrected documentation for hardware time stamping
  stmmac: use resource_size()
  x.25 attempts to negotiate invalid throughput
  x25: Patch to fix bug 15678 - x25 accesses fields beyond end of packet.
  bridge: Fix IGMP3 report parsing
  cnic: Fix crash during bnx2x MTU change.
  qlcnic: fix set mac addr
  r6040: fix r6040_multicast_list
  vhost-net: fix vq_memory_access_ok error checking
  ath9k: fix double calls to ath_radio_enable
  ...
parents 0d0fb0f9 a6d37024

Documentation/networking/timestamping.txt

+46 −30
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ SOF_TIMESTAMPING_SOFTWARE: return system time stamp generated in 
SOF_TIMESTAMPING_TX/RX determine how time stamps are generated.

SOF_TIMESTAMPING_RAW/SYS determine how they are reported in the

following control message:



struct scm_timestamping {

	struct timespec systime;

	struct timespec hwtimetrans;
@@ -87,7 +88,8 @@ by the network device and will be empty without that support. 
SIOCSHWTSTAMP:



Hardware time stamping must also be initialized for each device driver

that is expected to do hardware time stamping. The parameter is:

that is expected to do hardware time stamping. The parameter is defined in

/include/linux/net_tstamp.h as:



struct hwtstamp_config {

	int flags;	/* no flags defined right now, must be zero */
@@ -145,36 +147,50 @@ enum { 
	/* PTP v1, UDP, any kind of event packet */

	HWTSTAMP_FILTER_PTP_V1_L4_EVENT,



        ...

	/* for the complete list of values, please check

	 * the include file /include/linux/net_tstamp.h

	 */

};





DEVICE IMPLEMENTATION



A driver which supports hardware time stamping must support the

SIOCSHWTSTAMP ioctl. Time stamps for received packets must be stored

in the skb with skb_hwtstamp_set().

SIOCSHWTSTAMP ioctl and update the supplied struct hwtstamp_config with

the actual values as described in the section on SIOCSHWTSTAMP.



Time stamps for received packets must be stored in the skb. To get a pointer

to the shared time stamp structure of the skb call skb_hwtstamps(). Then

set the time stamps in the structure:



struct skb_shared_hwtstamps {

	/* hardware time stamp transformed into duration

	 * since arbitrary point in time

	 */

	ktime_t	hwtstamp;

	ktime_t	syststamp; /* hwtstamp transformed to system time base */

};



Time stamps for outgoing packets are to be generated as follows:

- In hard_start_xmit(), check if skb_hwtstamp_check_tx_hardware()

  returns non-zero. If yes, then the driver is expected

  to do hardware time stamping.

- In hard_start_xmit(), check if skb_tx(skb)->hardware is set no-zero.

  If yes, then the driver is expected to do hardware time stamping.

- If this is possible for the skb and requested, then declare

  that the driver is doing the time stamping by calling

  skb_hwtstamp_tx_in_progress(). A driver not supporting

  hardware time stamping doesn't do that. A driver must never

  touch sk_buff::tstamp! It is used to store how time stamping

  for an outgoing packets is to be done.

  that the driver is doing the time stamping by setting the field

  skb_tx(skb)->in_progress non-zero. You might want to keep a pointer

  to the associated skb for the next step and not free the skb. A driver

  not supporting hardware time stamping doesn't do that. A driver must

  never touch sk_buff::tstamp! It is used to store software generated

  time stamps by the network subsystem.

- As soon as the driver has sent the packet and/or obtained a

  hardware time stamp for it, it passes the time stamp back by

  calling skb_hwtstamp_tx() with the original skb, the raw

  hardware time stamp and a handle to the device (necessary

  to convert the hardware time stamp to system time). If obtaining

  the hardware time stamp somehow fails, then the driver should

  not fall back to software time stamping. The rationale is that

  this would occur at a later time in the processing pipeline

  than other software time stamping and therefore could lead

  to unexpected deltas between time stamps.

- If the driver did not call skb_hwtstamp_tx_in_progress(), then

  hardware time stamp. skb_hwtstamp_tx() clones the original skb and

  adds the timestamps, therefore the original skb has to be freed now.

  If obtaining the hardware time stamp somehow fails, then the driver

  should not fall back to software time stamping. The rationale is that

  this would occur at a later time in the processing pipeline than other

  software time stamping and therefore could lead to unexpected deltas

  between time stamps.

- If the driver did not call set skb_tx(skb)->in_progress, then

  dev_hard_start_xmit() checks whether software time stamping

  is wanted as fallback and potentially generates the time stamp.

drivers/net/cnic.c

+5 −5
Original line number Diff line number Diff line
@@ -2334,13 +2334,13 @@ static int cnic_service_bnx2x(void *data, void *status_blk) 
	struct cnic_local *cp = dev->cnic_priv;

	u16 prod = cp->kcq_prod_idx & MAX_KCQ_IDX;



	if (likely(test_bit(CNIC_F_CNIC_UP, &dev->flags))) {

		prefetch(cp->status_blk.bnx2x);

		prefetch(&cp->kcq[KCQ_PG(prod)][KCQ_IDX(prod)]);



	if (likely(test_bit(CNIC_F_CNIC_UP, &dev->flags)))

		tasklet_schedule(&cp->cnic_irq_task);



		cnic_chk_pkt_rings(cp);

	}



	return 0;

}

drivers/net/e1000e/netdev.c

+2 −0
Original line number Diff line number Diff line
@@ -661,6 +661,8 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter) 
				i = 0;

		}



		if (i == tx_ring->next_to_use)

			break;

		eop = tx_ring->buffer_info[i].next_to_watch;

		eop_desc = E1000_TX_DESC(*tx_ring, eop);

	}

drivers/net/igb/igb_ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -1814,6 +1814,7 @@ static int igb_wol_exclusion(struct igb_adapter *adapter, 
		retval = 0;

		break;

	case E1000_DEV_ID_82576_QUAD_COPPER:

	case E1000_DEV_ID_82576_QUAD_COPPER_ET2:

		/* quad port adapters only support WoL on port A */

		if (!(adapter->flags & IGB_FLAG_QUAD_PORT_A)) {

			wol->supported = 0;

drivers/net/igb/igb_main.c

+1 −0
Original line number Diff line number Diff line
@@ -1612,6 +1612,7 @@ static int __devinit igb_probe(struct pci_dev *pdev, 
			adapter->eeprom_wol = 0;

		break;

	case E1000_DEV_ID_82576_QUAD_COPPER:

	case E1000_DEV_ID_82576_QUAD_COPPER_ET2:

		/* if quad port adapter, disable WoL on all but port A */

		if (global_quad_port_a != 0)

			adapter->eeprom_wol = 0;