apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	Documentation/feature-removal-schedule.txt
This commit is contained in:
John W. Linville
2011-10-11 15:35:42 -04:00
parent 3ed6f6958c 5f68a2b0a8
commit 094daf7db7
128 changed files with 6655 additions and 2722 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/if_ether.h
+1
View File
@@ -83,6 +83,7 @@
#define ETH_P_8021AH 0x88E7 /* 802.1ah Backbone Service Tag */
#define ETH_P_1588 0x88F7 /* IEEE 1588 Timesync */
#define ETH_P_FCOE 0x8906 /* Fibre Channel over Ethernet */
#define ETH_P_TDLS 0x890D /* TDLS */
#define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */
#define ETH_P_QINQ1 0x9100 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
#define ETH_P_QINQ2 0x9200 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */