Jesse Gross
3701e51382
vlan: Centralize handling of hardware acceleration. ...
Currently each driver that is capable of vlan hardware acceleration
must be aware of the vlan groups that are configured and then pass
the stripped tag to a specialized receive function. This is
different from other types of hardware offload in that it places a
significant amount of knowledge in the driver itself rather keeping
it in the networking core.
This makes vlan offloading function more similarly to other forms
of offloading (such as checksum offloading or TSO) by doing the
following:
* On receive, stripped vlans are passed directly to the network
core, without attempting to check for vlan groups or reconstructing
the header if no group
* vlans are made less special by folding the logic into the main
receive routines
* On transmit, the device layer will add the vlan header in software
if the hardware doesn't support it, instead of spreading that logic
out in upper layers, such as bonding.
There are a number of advantages to this:
* Fixes all bugs with drivers incorrectly dropping vlan headers at once.
* Avoids having to disable VLAN acceleration when in promiscuous mode
(good for bridging since it always puts devices in promiscuous mode).
* Keeps VLAN tag separate until given to ultimate consumer, which
avoids needing to do header reconstruction as in tg3 unless absolutely
necessary.
* Consolidates common code in core networking.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-10-21 01:26:53 -07:00
VIDEO: amba clcd: don't disable an already disabled clock
2010-08-17 22:15:09 +01:00
include: replace unifdef-y with header-y
2010-08-14 22:26:51 +02:00
can: mcp251x: Don't use pdata->model for chip selection anymore
2010-10-18 15:16:08 +02:00
include: replace unifdef-y with header-y
2010-08-14 22:26:51 +02:00
gpio: sx150x: correct and refine reset-on-probe behavior
2010-09-09 18:57:24 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
2010-08-12 10:01:30 -07:00
mlx4_en: UDP RSS support
2010-08-24 14:57:09 -07:00
Bluetooth: Support SDIO devices that are AMP controllers
2010-10-12 12:44:51 -03:00
mtd: Remove obsolete <mtd/compatmac.h> include
2010-08-08 21:19:42 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2010-08-23 18:30:30 -07:00
include: replace unifdef-y with header-y
2010-08-14 22:26:51 +02:00
include: replace unifdef-y with header-y
2010-08-14 22:26:51 +02:00
include: replace unifdef-y with header-y
2010-08-14 22:26:51 +02:00
include: replace unifdef-y with header-y
2010-08-14 22:26:51 +02:00
include: replace unifdef-y with header-y
2010-08-14 22:26:51 +02:00
POWER: Add JZ4740 battery driver.
2010-08-05 13:26:20 +01:00
Make lib/raid6/test build correctly.
2010-08-12 06:38:24 +10:00
ab8500-mfd: add regulator support to ab8500 mfd device
2010-08-11 11:38:01 +01:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-10-06 19:39:31 -07:00
b43: N-PHY: Implement MAC PHY clock set
2010-08-24 16:28:11 -04:00
SUNRPC: Fix a race in rpc_info_open
2010-09-12 19:55:25 -04:00
net/sched: add ACT_CSUM action to update packets checksums
2010-08-20 01:42:59 -07:00
tc: add meta match on receive hash
2010-08-24 14:48:10 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2010-08-28 13:55:31 -07:00
ACPI/PCI: Negotiate _OSC control bits before requesting them
2010-08-24 13:44:40 -07:00
ahci_platform: Provide for vendor specific init
2010-08-01 19:36:03 -04:00
net: return operator cleanup
2010-09-23 14:33:39 -07:00
gcc-4.6: fs: fix unused but set warnings
2010-08-07 18:23:12 +02:00
autofs/autofs4: Move compat_ioctl handling into fs
2010-08-09 00:13:34 +02:00
mm: fix writeback_in_progress()
2010-08-12 08:43:30 -07:00
Make do_execve() take a const filename pointer
2010-08-17 18:07:43 -07:00
bio, fs: separate out bio_types.h and define READ/WRITE constants in terms of BIO_RW_* flags
2010-08-07 18:53:10 +02:00
block: add secure discard
2010-08-12 08:43:30 -07:00
block: add secure discard
2010-08-12 08:43:30 -07:00
block: fix for block tracing build error
2010-08-07 18:26:29 +02:00
remove SWRITE* I/O types
2010-08-18 01:09:01 -04:00
security: move LSM xattrnames to xattr.h
2010-08-02 15:34:57 +10:00
cgroups: fix API thinko
2010-09-09 18:57:23 -07:00
coda: fixup clash with block layer REQ_* defines
2010-08-07 18:53:13 +02:00
compat: Make compat_alloc_user_space() incorporate the access_ok()
2010-09-14 16:08:45 -07:00
include/linux/compiler-gcc.h: use __same_type() in __must_be_array()
2010-08-09 20:45:04 -07:00
console: Fix compilation regression
2010-08-06 15:36:47 -05:00
tty: Move the vt_tty field from the vc_data into the standard tty_port
2010-08-10 13:47:42 -07:00
ACPI, APEI, Rename CPER and GHES severity constants
2010-08-08 14:55:26 -04:00
[CPUFREQ] unexport (un)lock_policy_rwsem* functions
2010-08-03 13:47:04 -04:00
intel_idle: Voluntary leave_mm before entering deeper
2010-09-30 21:19:22 -04:00
vfs: show unreachable paths in getcwd and proc
2010-08-11 00:29:47 -04:00
dccp: Replace magic CCID-specific numbers by symbolic constants
2010-09-21 12:14:25 +02:00
timer: Added usleep_range timer
2010-08-04 11:00:45 +02:00
dm: factor out max_io_len_target_boundary
2010-08-12 04:14:10 +01:00
driver core: device_rename's new_name can be const
2010-08-05 13:53:35 -07:00
dm: allow autoloading of dm mod
2010-08-12 04:14:05 +01:00
arm: fix "arm: fix pci_set_consistent_dma_mask for dmabounce devices"
2010-09-22 17:22:38 -07:00
missing inline keyword for static function in linux/dmaengine.h
2010-09-22 15:29:32 -07:00
DNS: Separate out CIFS DNS Resolver code
2010-08-05 17:17:51 +00:00
drbd: revert "delay probes", feature is being re-implemented differently
2010-08-07 18:53:57 +02:00
drbd: revert "delay probes", feature is being re-implemented differently
2010-08-07 18:53:57 +02:00
block: add function call to switch the IO scheduler from a driver
2010-08-23 13:52:19 +02:00
net: return operator cleanup
2010-09-23 14:33:39 -07:00
ethtool: Add Ethernet MAC-level filtering/steering
2010-09-21 14:57:58 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
2010-08-10 11:26:52 -07:00
fanotify: resize pid and reorder structure
2010-08-27 19:54:09 -04:00
vt/console: try harder to print output when panicing
2010-08-10 13:47:40 -07:00
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-08-06 09:23:07 -07:00
Merge firewire branches to be released post v2.6.35
2010-08-02 10:09:04 +02:00
flex_array: add helpers to get and put to make pointers easy to use
2010-08-09 20:45:09 -07:00
fs: {lock,unlock}_flocks() stubs to prepare for BKL removal
2010-09-21 17:27:44 -07:00
fs: fs_struct rwlock to spinlock
2010-08-18 08:35:46 -04:00
powerpc/5121: move fsl-diu-fb.h to include/linux
2010-08-01 17:06:44 -06:00
Revert "fsnotify: store struct file not struct path"
2010-08-12 14:23:04 -07:00
fanotify: flush outstanding perm requests on group destroy
2010-08-22 20:28:16 -04:00
gpiolib: Add 'struct gpio_chip' forward declaration for !GPIOLIB case
2010-09-01 08:55:24 -06:00
Input: gpio_keys - add hooks to enable/disable device
2010-08-03 19:45:31 -07:00
gcc-4.6: mm: fix unused but set warnings
2010-08-09 20:44:58 -07:00
HWPOISON, hugetlb: isolate corrupted hugepage
2010-08-11 09:22:46 +02:00
hwpoison: rename CONFIG
2010-08-11 09:23:22 +02:00
i2c: Multiplexed I2C bus core support
2010-08-11 18:21:02 +02:00
i2c: Multiplexed I2C bus core support
2010-08-11 18:21:02 +02:00
mac80211: Update mesh constants to approved IEEE ANA values
2010-10-11 15:04:21 -04:00
net: fix datapath typo
2010-08-29 21:57:55 -07:00
bonding: add retransmit membership reports tunable
2010-10-05 20:26:58 -07:00
include/linux/if_ether.h: Remove unused #define MAC_FMT
2010-08-24 14:46:53 -07:00
header: fix broken headers for user space
2010-08-22 21:15:39 -07:00
header: fix broken headers for user space
2010-08-22 21:15:39 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-08-04 15:31:02 -07:00
macvtap: Implement multiqueue for macvtap driver
2010-08-16 21:06:25 -07:00
net: constify some ppp/pptp structs
2010-09-21 18:04:47 -07:00
vlan: Centralize handling of hardware acceleration.
2010-10-21 01:26:53 -07:00
net: introduce proto_ports_offset()
2010-08-19 17:16:23 -07:00
ipv4: introduce __ip_dev_find()
2010-09-30 21:16:05 -07:00
Input: dynamically allocate ABS information
2010-08-02 20:30:04 -07:00
agp/intel: Fix cache control for Sandybridge
2010-09-07 11:16:43 +01:00
gpio: Add PMIC GPIO block support
2010-08-03 09:49:09 -04:00
io-mapping: Fix the address space annotations
2010-09-05 14:26:15 +02:00
iommu: inline iommu_num_pages
2010-08-09 20:45:05 -07:00
header: fix broken headers for user space
2010-08-22 21:15:39 -07:00
istallion: use bit ops for the board flags
2010-08-10 13:47:40 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2010-08-07 13:03:53 -07:00
Merge git://git.infradead.org/mtd-2.6
2010-08-10 11:49:21 -07:00
mfd: Add JZ4740 ADC driver
2010-08-12 11:27:58 +02:00
RDS: Add rds.h to exported headers list
2010-09-08 18:16:52 -07:00
vt,console,kdb: automatically set kdb LINES variable
2010-08-05 09:22:30 -05:00
Add a dummy printk function for the maintenance of unused printks
2010-08-12 09:51:35 -07:00
kfifo: add parenthesis for macro parameter reference
2010-09-09 18:57:22 -07:00
gdbstub: Implement gdbserial 'p' and 'P' packets
2010-08-05 09:22:21 -05:00
kobject: Break the kobject namespace defs into their own header
2010-08-23 18:12:46 -07:00
kobject: Break the kobject namespace defs into their own header
2010-08-23 18:12:46 -07:00
mm: fix swapin race condition
2010-09-09 18:57:24 -07:00
KVM: Remove memory alias support
2010-08-01 10:47:00 +03:00
KVM: Convert mask notifiers to use irqchip/pin instead of gsi
2010-08-02 06:40:39 +03:00
KVM: Use u64 for frame data types
2010-08-02 06:39:44 +03:00
lglock: make lg_lock_global() actually lock globally
2010-09-09 09:09:43 -07:00
libata-sff: Reenable Port Multiplier after libata-sff remodeling.
2010-09-09 22:31:55 -04:00
AppArmor: basic auditing infrastructure.
2010-08-02 15:35:11 +10:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2010-08-04 11:47:58 -07:00
mbcache: Remove unused features
2010-08-09 16:48:45 -04:00
memcg: remove nid and zid argument from mem_cgroup_soft_limit_reclaim()
2010-08-11 08:59:19 -07:00
oom: select task from tasklist for mempolicy ooms
2010-08-09 20:44:56 -07:00
Input: uinput - add devname alias to allow module on-demand load
2010-08-21 00:37:40 -07:00
mm: Move vma_stack_continue into mm.h
2010-09-09 09:05:06 -07:00
mm: make the vma list be doubly linked
2010-08-21 08:49:21 -07:00
gcc-4.6: mm: fix unused but set warnings
2010-08-09 20:44:58 -07:00
mm: page allocator: calculate a better estimate of NR_FREE_PAGES when memory is low and kswapd is awake
2010-09-09 18:57:25 -07:00
modules: Fix module_bug_list list corruption race
2010-10-05 11:29:27 -07:00
param: don't deref arg in __same_type() checks
2010-08-11 23:04:41 +09:30
vfs: remove unused MNT_STRICTATIME
2010-08-11 00:29:47 -04:00
ipmr: RCU protection for mfc_cache_array
2010-10-03 21:50:53 -07:00
mutex: Fix annotations to include it in kernel-locking docbook
2010-09-03 08:19:51 +02:00
header: fix broken headers for user space
2010-08-22 21:15:39 -07:00
header: fix broken headers for user space
2010-08-22 21:15:39 -07:00
vlan: Centralize handling of hardware acceleration.
2010-10-21 01:26:53 -07:00
net: Move "struct net" declaration inside the __KERNEL__ macro guard
2010-09-22 13:21:05 -07:00
bonding: Fix bonding drivers improper modification of netpoll structure
2010-10-18 08:32:07 -07:00
Merge branch 'nfs-for-2.6.36' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
2010-08-07 13:19:36 -07:00
NFS: Fix /proc/mount for legacy binary interface
2010-08-06 13:41:39 -04:00
cfg80211: add channel utilization stats to the survey command
2010-10-11 15:04:20 -04:00
of/address: Clean up function declarations
2010-08-01 01:42:42 -06:00
of/device: Replace struct of_device with struct platform_device
2010-08-06 09:25:50 -06:00
of/device: Replace struct of_device with struct platform_device
2010-08-06 09:25:50 -06:00
Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
2010-08-08 10:02:59 -07:00
memcg: use find_lock_task_mm() in memory cgroups oom
2010-08-11 08:59:19 -07:00
Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6
2010-08-12 10:15:10 -07:00
vfs: show unreachable paths in getcwd and proc
2010-08-11 00:29:47 -04:00
dmaengine: Driver for Topcliff PCH DMA controller
2010-08-04 14:12:05 -07:00
PCI: provide stub pci_domain_nr function for !CONFIG_PCI configs
2010-08-13 16:19:59 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-10-06 19:39:31 -07:00
percpu: handle __percpu notations in UP accessors
2010-08-07 14:20:53 +02:00
tmpfs: add accurate compare function to percpu_counter library
2010-08-09 20:44:58 -07:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-08-06 09:39:22 -07:00
Phonet: 'connect' socket implementation for Pipe controller
2010-10-13 14:40:34 -07:00
net: Improve comments in include/linux/phy.h
2010-09-02 10:12:05 -07:00
net_sched: cls_flow: add key rxhash
2010-08-21 23:40:14 -07:00
Driver core: reduce duplicated code for platform_device creation
2010-08-05 13:53:34 -07:00
hugetlb, rmap: add reverse mapping for hugepage
2010-08-11 09:21:15 +02:00
ppp: make channel_ops const
2010-08-04 21:53:17 -07:00
net: add Fast Ethernet driver for PXA168.
2010-08-18 23:30:42 -07:00
dquot: do full inode dirty in allocating space
2010-09-09 16:08:51 +02:00
mm: implement writeback livelock avoidance using page tagging
2010-08-09 20:44:59 -07:00
rar: Move the RAR driver into the right place as its now clean
2010-08-03 09:48:50 -04:00
rcu: rcu_read_lock_bh_held(): disabling irqs also disables bh
2010-09-23 08:25:17 -07:00
RDS: Remove dead struct from rds.h
2010-09-08 18:16:55 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
2010-08-10 11:26:52 -07:00
Fix reiserfs_file_release()
2010-08-09 16:47:27 -04:00
header: fix broken headers for user space
2010-08-22 21:15:39 -07:00
Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6
2010-08-12 10:15:10 -07:00
net: relax rtnl_dereference()
2010-10-05 00:29:48 -07:00
Make do_execve() take a const filename pointer
2010-08-17 18:07:43 -07:00
Merge branch 'writable_limits' of git://decibel.fi.muni.cz/~xslaby/linux
2010-08-10 12:07:51 -07:00
semaphore: Add DEFINE_SEMAPHORE
2010-09-08 15:04:10 +02:00
serial: fix port type conflict between NS16550A & U6_16550A
2010-09-03 17:29:04 -07:00
U6715 16550A serial driver support
2010-08-10 13:47:46 -07:00
serial: fix port type conflict between NS16550A & U6_16550A
2010-09-03 17:29:04 -07:00
hsu: driver for Medfield High Speed UART device
2010-08-10 13:47:46 -07:00
hsu: driver for Medfield High Speed UART device
2010-08-10 13:47:46 -07:00
sh: add a reparent function to DIV6 clocks
2010-08-04 16:12:01 +09:00
tmpfs: make tmpfs scalable with percpu_counter for used blocks
2010-08-09 20:44:58 -07:00
net: avoid RCU for NOCACHE dst
2010-10-20 03:02:23 -07:00
dma-mapping: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN
2010-08-11 08:59:21 -07:00
dma-mapping: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN
2010-08-11 08:59:21 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
2010-08-22 10:08:52 -07:00
tcp: Fix >4GB writes on 64-bit.
2010-09-27 20:24:54 -07:00
add f_flags to struct statfs(64)
2010-08-09 16:48:44 -04:00
stmmac: review the wake-up support
2010-09-24 21:27:41 -07:00
swap: discard while swapping only if SWAP_FLAG_DISCARD
2010-09-09 18:57:25 -07:00
Make do_execve() take a const filename pointer
2010-08-17 18:07:43 -07:00
kobject: Break the kobject namespace defs into their own header
2010-08-23 18:12:46 -07:00
Input: sysrq - drop tty argument form handle_sysrq()
2010-08-21 00:34:45 -07:00
fs/sysv: v7: adjust sanity checks for some volumes
2010-08-11 08:59:22 -07:00
tcp: Add TCP_USER_TIMEOUT socket option.
2010-08-30 13:23:33 -07:00
Mark arguments to certain syscalls as being const
2010-08-13 16:53:13 -07:00
timer: add on-stack deferrable timer interfaces
2010-08-03 09:48:45 -04:00
topology: alternate fix for ia64 tiger_defconfig build breakage
2010-08-09 20:44:57 -07:00
tty: fix fu_list abuse
2010-08-18 08:35:47 -04:00
Merge branch 'master' into for-linus
2010-08-06 10:37:02 -04:00
Input: uinput - add devname alias to allow module on-demand load
2010-08-21 00:37:40 -07:00
USB:: fix linux/usb.h kernel-doc warnings
2010-08-10 14:35:44 -07:00
vgaarb: Wrap vga_(get|put) in CONFIG_VGA_ARB
2010-08-27 09:10:44 +10:00
V4L/DVB: v4l: Add driver for Samsung S5P SoC video postprocessor
2010-08-08 23:43:01 -03:00
virtio_9p.h: include linux/types.h
2010-08-11 08:59:02 -07:00
Merge branch 'stable/xen-swiotlb-0.8.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2010-08-12 09:09:41 -07:00
mm: page allocator: calculate a better estimate of NR_FREE_PAGES when memory is low and kswapd is awake
2010-09-09 18:57:25 -07:00
vt: Fix warning: statement with no effect due to vt_kern.h
2010-08-10 13:47:44 -07:00
wait: using uninitialized member of wait queue
2010-10-05 11:47:18 -07:00
wext: fix alignment problem in serializing 'struct iw_point'
2010-10-13 15:45:21 -04:00
wl12xx: fix non-wl12xx build scenarios
2010-09-30 06:01:56 +03:00
workqueue: add documentation
2010-09-13 10:26:52 +02:00
writeback: avoid unnecessary calculation of bdi dirty thresholds
2010-08-12 08:43:29 -07:00
security: move LSM xattrnames to xattr.h
2010-08-02 15:34:57 +10:00
