Paul LeoNerd Evans
40eaf96271
net: Socket filter ancilliary data access for skb->dev->type ...
Add an SKF_AD_HATYPE field to the packet ancilliary data area, giving
access to skb->dev->type, as reported in the sll_hatype field.
When capturing packets on a PF_PACKET/SOCK_RAW socket bound to all
interfaces, there doesn't appear to be a way for the filter program to
actually find out the underlying hardware type the packet was captured
on. This patch adds such ability.
This patch also handles the case where skb->dev can be NULL, such as on
netlink sockets.
Signed-off-by: Paul Evans <leonerd@leonerd.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-22 16:05:44 -07:00
ARM: 6003/1: removing compilation warning from pl061.h
2010-03-29 17:33:33 +01:00
net-caif: add CAIF socket and configuration headers
2010-03-30 19:08:44 -07:00
Fix some #includes in CAN drivers (rebased for net-next-2.6)
2010-04-13 03:32:42 -07:00
decompress: fix new decompressor for PIC
2010-03-12 15:52:44 -08:00
mfd: Introduce remove_script function for twl4030
2010-03-07 22:17:32 +01:00
Input: matrix_keypad - allow platform to disable key autorepeat
2010-04-05 23:02:00 -07:00
mfd: Fix ucb1x00 build failure for collie_defconfig
2010-03-07 22:17:39 +01:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
2010-04-15 16:21:34 -04:00
netfilter: ctnetlink: fix reliable event delivery if message building fails
2010-03-20 14:29:03 -07:00
netfilter: xtables: replace XT_ENTRY_ITERATE macro
2010-02-24 18:32:59 +01:00
netfilter: xtables: replace XT_MATCH_ITERATE macro
2010-02-24 18:34:48 +01:00
netfilter: xtables: replace XT_MATCH_ITERATE macro
2010-02-24 18:34:48 +01:00
regulator: enable max8649 regulator driver
2010-03-03 14:49:24 +00:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
SUNRPC: Fix a use after free bug with the NFSv4.1 backchannel
2010-03-22 05:32:44 -04:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
sysctl extern cleanup: acct
2010-03-12 15:53:10 -08:00
libata: Fix accesses at LBA28 boundary (old bug, but nasty) (v2)
2010-04-08 12:53:57 -04:00
backlight: Allow properties to be passed at registration
2010-03-16 19:47:54 +00:00
coredump: pass mm->flags as a coredump parameter for consistency
2010-03-06 11:26:46 -08:00
bitops: remove temporary for_each_bit()
2010-04-07 08:38:01 -07:00
block: remove 16 bytes of padding from struct request on 64bits
2010-03-19 08:58:16 +01:00
cciss: Consolidate duplicate bits in cciss_cmd.h & cciss_ioctl.h
2010-02-22 13:44:45 +01:00
cciss: Consolidate duplicate bits in cciss_cmd.h & cciss_ioctl.h
2010-02-22 13:44:45 +01:00
cgroups: remove events before destroying subsystem state objects
2010-03-12 15:52:37 -08:00
Document Linux's circular buffering capabilities
2010-03-24 16:31:22 -07:00
clockevents: Sanitize min_delta_ns adjustment and prevent overflows
2010-03-12 19:10:29 +01:00
Add generic sys_old_select()
2010-03-12 15:52:32 -08:00
coredump: plug a memory leak situation on dump_seek()
2010-03-12 15:52:32 -08:00
cpumask: let num_*_cpus() function always return unsigned values
2010-03-06 11:26:29 -08:00
rcu: Use wrapper function instead of exporting tasklist_lock
2010-03-04 11:46:14 +01:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
dm table: remove unused dm_get_device range parameters
2010-03-06 02:32:27 +00:00
Driver core: create lock/unlock functions for struct device
2010-03-07 17:04:52 -08:00
dm: eliminate some holes data structures
2010-03-06 02:32:33 +00:00
dm ioctl: introduce flag indicating uevent was generated
2010-03-06 02:32:31 +00:00
dma-mapping: dma-mapping.h: add dma_set_coherent_mask
2010-03-12 15:52:42 -08:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
2010-03-04 08:20:14 -08:00
drbd: --dry-run option for drbdsetup net ( drbdadm -- --dry-run connect <res> )
2010-03-11 15:51:23 +01:00
drbd: Renamed overwrite_peer to primary_force
2010-03-11 16:32:14 +01:00
early_res: Add free_early_partial()
2010-02-26 08:25:35 +01:00
elf coredump: add extended numbering support
2010-03-06 11:26:46 -08:00
elf coredump: add extended numbering support
2010-03-06 11:26:46 -08:00
net: fix ethtool coding style errors and warnings
2010-04-07 21:54:42 -07:00
commit_metadata export operation replacing nfsd_sync_dir
2010-02-20 13:13:44 -08:00
ext3: fix broken handling of EXT3_STATE_NEW
2010-03-29 14:30:19 -07:00
ext3: fix broken handling of EXT3_STATE_NEW
2010-03-29 14:30:19 -07:00
failslab: add ability to filter slab caches
2010-02-26 19:19:39 +02:00
vga_switcheroo: initial implementation (v15)
2010-03-01 16:20:37 +10:00
vfs: Abstract rcu_dereference_check for files-fdtable use
2010-02-25 10:34:49 +01:00
ipv4: ipmr: support multiple tables
2010-04-13 14:49:34 -07:00
net: Socket filter ancilliary data access for skb->dev->type
2010-04-22 16:05:44 -07:00
firewire: cdev: change license of exported header files to MIT license
2010-04-15 17:50:49 +02:00
firewire: cdev: change license of exported header files to MIT license
2010-04-15 17:50:49 +02:00
memory-hotplug: create /sys/firmware/memmap entry for new memory
2010-03-06 11:26:25 -08:00
Freezer: Fix buggy resume test for tasks frozen with cgroup freezer
2010-03-26 23:51:44 +01:00
fasync: RCU and fine grained locking
2010-04-21 16:19:29 -07:00
SLOW_WORK: CONFIG_SLOW_WORK_PROC should be CONFIG_SLOW_WORK_DEBUG
2010-03-29 09:14:47 -07:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-02-28 10:20:25 -08:00
perf: Drop the obsolete profile naming for trace events
2010-03-10 14:47:18 +01:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
netlink: Export genl_lock() API for use by modules
2010-04-03 14:56:05 -07:00
Remove GENHD_FL_DRIVERFS
2010-03-16 08:55:32 +01:00
mm: add comment about deprecation of __GFP_NOFAIL
2010-03-06 11:26:27 -08:00
GFS2: Remove old, unused linked list code from quota
2010-03-01 14:08:10 +00:00
Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus
2010-02-25 17:39:16 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/xfs-vipt
2010-02-26 17:05:10 -08:00
mfd: Add HTCPLD driver
2010-03-07 22:17:09 +01:00
percpu: Add __percpu sparse annotations to hw_breakpoint
2010-02-27 16:23:39 +01:00
i2c-algo-bit: Add pre- and post-xfer hooks
2010-03-13 20:56:56 +01:00
i2c: Add SMBus alert support
2010-03-02 12:23:42 +01:00
Add the platform data include for the Xilinx XPS IIC Bus Interface
2010-03-14 11:14:58 -07:00
i2c: Document the message size limit
2010-03-02 12:23:49 +01:00
i2o: Remove the dangerous kobj_to_i2o_device macro
2010-03-24 08:20:03 +01:00
ipv6: drop unused "dev" arg of icmpv6_send()
2010-02-18 14:30:17 -08:00
ide: Requeue request after DMA timeout
2010-04-01 01:31:13 -07:00
mac80211: Moved mesh action codes to a more visible location
2010-04-08 15:24:07 -04:00
net-caif: add CAIF protocol definitions
2010-03-30 19:08:43 -07:00
net-caif: add CAIF protocol definitions
2010-03-30 19:08:43 -07:00
net: core: add IFLA_STATS64 support
2010-03-16 21:23:22 -07:00
packet: support for TX time stamps on RAW sockets
2010-04-13 01:30:48 -07:00
l2tp: Update PPP-over-L2TP driver to work over L2TPv3
2010-04-03 14:56:04 -07:00
l2tp: Update PPP-over-L2TP driver to work over L2TPv3
2010-04-03 14:56:04 -07:00
if_tunnel.h: add missing ams/byteorder.h include
2010-03-21 21:19:02 -07:00
IPv6: Generic TTL Security Mechanism (final version)
2010-04-22 15:24:53 -07:00
nsproxy: remove INIT_NSPROXY()
2010-03-12 15:52:40 -08:00
Input: scancode in get/set_keycodes should be unsigned
2010-03-08 23:19:15 -08:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
cgroups: blkio subsystem as module
2010-03-12 15:52:36 -08:00
resources: add interfaces that return conflict information
2010-03-23 13:33:50 -07:00
nsproxy: remove INIT_NSPROXY()
2010-03-12 15:52:40 -08:00
ipmi: remove ipmi_smi.h self-include
2010-03-12 15:52:40 -08:00
IPv6: Generic TTL Security Mechanism (final version)
2010-04-22 15:24:53 -07:00
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-03-03 08:15:37 -08:00
ibft, x86: Change reserve_ibft_region() to find_ibft_region()
2010-04-01 16:12:48 -07:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
2010-03-02 10:41:26 -08:00
kernel.h: fix wrong usage of __ratelimit()
2010-04-07 08:38:04 -07:00
include/linux/kfifo.h: fix INIT_KFIFO()
2010-04-07 08:38:02 -07:00
sysctl extern cleanup: module
2010-03-12 15:53:10 -08:00
Driver core: Constify struct sysfs_ops in struct kobj_type
2010-03-07 17:04:49 -08:00
kprobes: Jump optimization sysctl interface
2010-02-25 17:49:25 +01:00
ks8842: Add platform data for setting mac address
2010-04-21 16:33:29 -07:00
KVM: x86: Add KVM_CAP_X86_ROBUST_SINGLESTEP
2010-03-01 12:36:14 -03:00
KVM: Convert kvm->requests_lock to raw_spinlock_t
2010-03-01 12:36:13 -03:00
l2tp: Add netlink control API for L2TP
2010-04-03 14:56:05 -07:00
block: Fix overrun in lcm() and move it to lib
2010-03-15 12:47:59 +01:00
libata: unlock HPA if device shrunk
2010-04-06 10:55:33 -04:00
lib: fix first line of kernel-doc for a few functions
2010-03-06 11:26:35 -08:00
sysctl extern cleanup: lockdep
2010-03-12 15:53:10 -08:00
switch inotify_user to anon_inode
2010-02-19 03:35:12 -05:00
memcg: fix oom kill behavior
2010-03-12 15:52:38 -08:00
memory hotplug: allow setting of phys_device
2010-03-17 18:43:47 -07:00
pagemap: fix pfn calculation for hugepage
2010-04-07 08:38:04 -07:00
nommu: fix build breakage
2010-03-12 15:52:28 -08:00
Merge branch 'for-next' into for-linus
2010-03-08 16:55:37 +01:00
take check for new events in namespace (guts of mounts_poll()) to namespace.c
2010-03-03 14:07:59 -05:00
phylib: Support phy module autoloading
2010-04-02 14:30:39 -07:00
Fix up possibly racy module refcounting
2010-04-05 19:50:02 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
2010-03-04 08:15:33 -08:00
ipv4: ipmr: support multiple tables
2010-04-13 14:49:34 -07:00
rps: cleanups
2010-04-20 01:18:05 -07:00
netfilter: restore POST_ROUTING hook in NF_HOOK_COND
2010-02-19 08:03:28 +01:00
netfilter: ip6table_raw: fix table priority
2010-03-25 11:17:26 +01:00
netlink: fix NETLINK_RECV_NO_ENOBUFS in netlink_set_err()
2010-03-20 14:29:03 -07:00
NFS: Remove requirement for inode->i_mutex from nfs_invalidate_mapping
2010-03-05 15:44:56 -05:00
NFSv4: fix delegated locking
2010-04-12 07:55:15 -04:00
cfg80211: Add local-state-change-only auth/deauth/disassoc
2010-04-07 14:37:56 -04:00
nodemask: fix the declaration of NODEMASK_ALLOC()
2010-03-12 15:52:38 -08:00
net: rtnetlink: ignore NETDEV_PRE_TYPE_CHANGE in rtnetlink_event()
2010-03-21 18:31:34 -07:00
of: Fix comparison of "compatible" properties
2010-03-18 07:30:31 -06:00
memcg: fix race in file_mapped accounting
2010-04-07 08:38:05 -07:00
PCI / ACPI / PM: Platform support for PCI PME wake-up
2010-02-22 16:21:02 -08:00
dma-mapping.h: add the dma_unmap state API
2010-03-12 15:52:42 -08:00
dma-mapping: pci: move pci_set_dma_mask and pci_set_consistent_dma_mask to pci-dma-compat.h
2010-03-12 15:52:42 -08:00
PCI: Make current and maximum bus speeds part of the PCI core
2010-02-22 16:15:17 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2010-03-03 08:47:22 -08:00
x86/PCI: Moorestown PCI support
2010-02-23 23:14:47 -08:00
Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc
2010-04-05 09:39:11 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2010-03-03 07:34:18 -08:00
perf: Use hot regs with software sched switch/migrate events
2010-04-01 08:26:31 +02:00
phylib: Support phy module autoloading
2010-04-02 14:30:39 -07:00
pktcdvd: use BIO list management functions
2010-02-24 08:30:08 +01:00
Driver core: make struct platform_driver.id_table const
2010-03-07 17:04:49 -08:00
PM: Provide generic subsystem-level callbacks
2010-03-06 21:28:37 +01:00
PM: Provide generic subsystem-level callbacks
2010-03-06 21:28:37 +01:00
sysctl extern cleanup: poll
2010-03-12 15:53:11 -08:00
ppp: Add ppp_dev_name() exported function
2010-04-03 14:56:02 -07:00
ptrace: move user_enable_single_step & co prototypes to linux/ptrace.h
2010-03-12 15:52:38 -08:00
quota: stop using QUOTA_OK / NO_QUOTA
2010-03-05 00:20:31 +01:00
dquot: cleanup dquot initialize routine
2010-03-05 00:20:30 +01:00
radix_tree_tag_get() is not as safe as the docs make out [ver #2 ]
2010-04-09 10:12:03 -07:00
doc: fix typo in comment explaining rb_tree usage
2010-02-25 11:45:20 +01:00
IPv6: convert addrconf hash list to RCU
2010-03-20 15:44:35 -07:00
rcu: Disable lockdep checking in RCU list-traversal primitives
2010-02-25 09:41:02 +01:00
rcu: Make RCU lockdep check the lockdep_recursion variable
2010-04-19 08:37:19 +02:00
rcu: Make rcu_read_lock_sched_held() take boot time into account
2010-02-26 08:20:46 +01:00
rcu: Make rcu_read_lock_sched_held() take boot time into account
2010-02-26 08:20:46 +01:00
sysctl extern cleanup: C_A_D
2010-03-12 15:52:44 -08:00
pass writeback_control to ->write_inode
2010-03-05 13:25:52 -05:00
reiserfs: fix oops while creating privroot with selinux enabled
2010-03-24 16:31:21 -07:00
PM: Asynchronous suspend and resume of devices
2010-02-26 20:39:09 +01:00
rfkill: Add support for KEY_RFKILL
2010-03-02 14:28:49 -05:00
vmscan: detect mapped file pages used only once
2010-03-06 11:26:27 -08:00
rtc/hctosys: only claim the RTC provided the system time if it did
2010-03-12 15:52:28 -08:00
sysctl extern cleanup: rtmutex
2010-03-12 15:53:10 -08:00
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
2010-02-28 19:23:06 -08:00
locking: Make sparse work with inline spinlocks and rwlocks
2010-03-13 01:21:21 +01:00
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-03-13 14:43:01 -08:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
seq_file: add RCU versions of new hlist/list iterators (v3)
2010-02-22 15:45:54 -08:00
pps: serial clients support
2010-03-12 15:52:43 -08:00
serial: sh-sci: Fix build failure for non-sh architectures.
2010-03-10 11:55:05 +09:00
sysctl extern cleanup: signal
2010-03-12 15:52:44 -08:00
net: Remove two unnecessary exports (skbuff).
2010-04-20 22:39:53 -07:00
slab: Generify kernel pointer validation
2010-04-09 10:09:50 -07:00
smp: fix documentation in include/linux/smp.h
2010-03-06 11:26:32 -08:00
icmp: Account for ICMP out errors
2010-04-03 15:09:04 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-04-06 23:53:30 -07:00
locking: Make sparse work with inline spinlocks and rwlocks
2010-03-13 01:21:21 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2010-03-03 07:34:18 -08:00
stmmac: new descriptor field for the driver's platform
2010-04-14 04:49:51 -07:00
memcg: move charges of anonymous swap
2010-03-12 15:52:36 -08:00
Fix up prototype for sys_ipc breakage
2010-03-22 13:12:33 -07:00
sysdev: Add sysdev_create/remove_files
2010-03-07 17:04:47 -08:00
sysfs: fix for thinko with sysfs_bin_attr_init()
2010-03-07 17:04:52 -08:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
net: TCP thin dupack
2010-02-18 15:43:09 -08:00
TIPC: Updated topology subscription protocol according to latest spec
2010-04-06 19:50:19 -07:00
rcu: Fix tracepoints & lockdep false positive
2010-03-16 10:10:40 +01:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-04-06 23:53:30 -07:00
USB: tty: Add a function to insert a string of characters with the same flag
2010-03-02 14:55:11 -08:00
ldisc: new dcd_change() method for line disciplines
2010-03-12 15:52:43 -08:00
USB: Fix usb_fill_int_urb for SuperSpeed devices
2010-03-19 07:24:23 -07:00
vga_switcheroo: fix build on platforms with no ACPI
2010-03-01 22:21:58 +11:00
V4L/DVB (14003): gspca_cpai1: New gspca subdriver for CPIA CPiA version 1 cams
2010-02-26 15:10:40 -03:00
net/9p: Add sysfs mount_tag file for virtio 9P device
2010-03-13 08:57:29 -06:00
net/9p: Use the tag name in the config space for identifying mount point
2010-03-13 08:57:28 -06:00
virtio: Add memory statistics reporting to the balloon driver (V4)
2010-02-24 14:22:08 +10:30
virtio_blk: add block topology support
2010-02-24 14:22:26 +10:30
virtio: disable multiport console support.
2010-04-08 09:46:19 +09:30
Revert "tty: Add a new VT mode which is like VT_PROCESS but doesn't require a VT_RELDISP ioctl call"
2010-03-19 07:17:52 -07:00
wireless.h: Use SIOCIWFIRST not SIOCSIWCOMMIT for range check
2010-03-23 16:50:26 -04:00
vfs: improve writeback_inodes_wb()
2010-03-12 10:03:42 +01:00
xfrm: introduce basic mark infrastructure
2010-02-22 16:19:45 -08:00
