From: David S. Miller Date: Wed, 12 Feb 2014 22:53:43 +0000 (-0500) Subject: Merge branch 'sfc' X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0e4767aaf499c98cf8a0120ee150e3aa38cee44f;p=deliverable%2Flinux.git Merge branch 'sfc' Shradha Shah says: ==================== Cleanup patches for the SFC driver This patch set consists of some cleanup and housekeeping patches for the sfc driver. These patches help to reduce the differences between the in- tree and out-of-tree driver. Ben Hutchings (12): sfc: Cache skb->data in local variable in efx_ptp_rx() sfc: Rewrite adjustment of PPS event in a clearer way sfc: Replace TSOH_OFFSET with the equivalent NET_IP_ALIGN sfc: Rename 'use_options' variable in tso_start() to clearer 'use_opt_desc' sfc: Remove unused definitions of EF10 user-mode DMA descriptors sfc: Correct comment about number of TX queues used on EF10 sfc: Preserve rx_frm_trunc counters when resizing DMA rings sfc: Use canonical pointer type for MAC address in efx_set_mac_address() sfc: Update product naming sfc: Cosmetic changes to self-test from the out-of-tree driver sfc: Fail self-test with -EBUSY, not -EIO, if the device is busy sfc: Add/remove blank lines to taste Laurence Evans (1): sfc: Removed adhoc scheme to rate limit PTP event queue overflow message ==================== Signed-off-by: David S. Miller --- 0e4767aaf499c98cf8a0120ee150e3aa38cee44f