user/sven/linux.git/include/linux/if_ether.h, branch v3.2

Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem

2011-10-11T19:35:42Z

Conflicts: Documentation/feature-removal-schedule.txt

mac80211: handle TDLS high-level commands and frames

2011-09-30T19:57:07Z

Register and implement the TDLS cfg80211 callback functions. Internally prepare and send TDLS management frames. We incorporate local STA capabilities and supported rates with extra IEs given by usermode. The resulting packet is either encapsulated in a data frame, or assembled as an action frame. It is transmitted either directly or through the AP, as mandated by the TDLS specification. Declare support for the TDLS external setup wiphy capability. This tells usermode to handle link setup and discovery on its own, and use the kernel driver for sending TDLS mgmt packets. Signed-off-by: Arik Nemtsov Cc: Kalyan C Gaddam Signed-off-by: John W. Linville

if_ether: add new Ethernet Protocol ID for af_iucv

2011-08-13T08:10:16Z

Add a new ethertype for af_iucv over s/390 HiperSockets transport. Since HiperSockets is not a real ethernet hw this is not an officially registered ID. Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller

net: add 802.1ad / 802.1ah / QinQ ethertypes

2011-07-17T19:33:22Z

define ETH_P_8021AD to 88a8 (assigned by IEEE) and add ETH_P_QINQ{1,2,3} for the pre-standard 9{1,2,3}00 types. all of them use 802.1q frame format, with 1 bit used differently in some cases. also define ETH_P_8021AH to 88e7 (assigned by IEEE). this is Mac-in-Mac and uses a different, 16-byte header. Signed-off-by: David Lamparter Signed-off-by: David S. Miller

net: Kill ether_table[] declaration.

2011-05-27T17:40:54Z

This got missed back in 2006 when Jes Sorensen deleted net/ethernet/sysctl_net_ether.c Signed-off-by: David S. Miller

net: add mac_pton() for parsing MAC address

2011-05-09T19:10:49Z

mac_pton() parses MAC address in form XX:XX:XX:XX:XX:XX and only in that form. mac_pton() doesn't dirty result until it's sure string representation is valid. mac_pton() doesn't care about characters _after_ last octet, it's up to caller to deal with it. mac_pton() diverges from 0/-E return value convention. Target usage: if (!mac_pton(str, whatever->mac)) return -EINVAL; /* ->mac being u8 [ETH_ALEN] is filled at this point. */ /* optionally check str[3 * ETH_ALEN - 1] for termination */ Use mac_pton() in pktgen and netconsole for start. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller

include/linux/if_ether.h: Add #define ETH_P_LINK_CTL for HPNA and wlan local tunnel

2011-01-06T19:10:05Z

Ethertype used by HPNA control protocols (LARQ, rate, link, etc) and by Broadcom wlan drivers for local signalling. Signed-off-by: Henry Ptasinski Signed-off-by: David S. Miller

include/linux/if_ether.h: Remove unused #define MAC_FMT

2010-08-24T21:46:53Z

Last use was removed, so remove the #define. Signed-off-by: Joe Perches Signed-off-by: David S. Miller

header: fix broken headers for user space

2010-08-23T04:15:39Z

__packed is only defined in kernel space, so we should use __attribute__((packed)) for the code shared between kernel and user space. Two __attribute() annotations are replaced with __attribute__() too. Signed-off-by: Changli Gao Signed-off-by: David S. Miller

net: use __packed annotation

2010-06-03T10:21:52Z

cleanup patch. Use new __packed annotation in net/ and include/ (except netfilter) Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller