History

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: (40 commits) tg3: Fix tg3_skb_error_unmap() net: tracepoint of net_dev_xmit sees freed skb and causes panic drivers/net/can/flexcan.c: add missing clk_put net: dm9000: Get the chip in a known good state before enabling interrupts drivers/net/davinci_emac.c: add missing clk_put af-packet: Add flag to distinguish VID 0 from no-vlan. caif: Fix race when conditionally taking rtnl lock usbnet/cdc_ncm: add missing .reset_resume hook vlan: fix typo in vlan_dev_hard_start_xmit() net/ipv4: Check for mistakenly passed in non-IPv4 address iwl4965: correctly validate temperature value bluetooth l2cap: fix locking in l2cap_global_chan_by_psm ath9k: fix two more bugs in tx power cfg80211: don't drop p2p probe responses Revert "net: fix section mismatches" drivers/net/usb/catc.c: Fix potential deadlock in catc_ctrl_run() sctp: stop pending timers and purge queues when peer restart asoc drivers/net: ks8842 Fix crash on received packet when in PIO mode. ip_options_compile: properly handle unaligned pointer iwlagn: fix incorrect PCI subsystem id for 6150 devices ...

Linus Torvalds committed 15 years ago

Commit 0e833d82 parents 4f1ba49 7b29dc260 files · +380 −219Browse files

Showing the changes to include/linux (2 of 60 files). Show all

Unified · Split

2 files
  1. include/linux/ieee80211.h +6 −2
  2. include/linux/if_packet.h +1 −0
include/linux/ieee80211.h+6−2
@@ -1003,8 +1003,12 @@ struct ieee80211_ht_info { · 1002 unmodified lines
10031003 #define WLAN_CAPABILITY_ESS (1<<0)
10041004 #define WLAN_CAPABILITY_IBSS (1<<1)
10051005
1006−/* A mesh STA sets the ESS and IBSS capability bits to zero */
1007−#define WLAN_CAPABILITY_IS_MBSS(cap) \
1006+/*
1007+ * A mesh STA sets the ESS and IBSS capability bits to zero.
1008+ * however, this holds true for p2p probe responses (in the p2p_find
1009+ * phase) as well.
1010+ */
1011+#define WLAN_CAPABILITY_IS_STA_BSS(cap) \
10081012 (!((cap) & (WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS)))
10091013
10101014 #define WLAN_CAPABILITY_CF_POLLABLE (1<<2)
include/linux/if_packet.h+1−0
@@ -70,6 +70,7 @@ struct tpacket_auxdata { · 69 unmodified lines
7070 #define TP_STATUS_COPY 0x2
7171 #define TP_STATUS_LOSING 0x4
7272 #define TP_STATUS_CSUMNOTREADY 0x8
73+#define TP_STATUS_VLAN_VALID 0x10 /* auxdata has valid tp_vlan_tci */
7374
7475 /* Tx ring - header status */
7576 #define TP_STATUS_AVAILABLE 0x0

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t