History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Jakub Kicinski committed 4 years ago

Commit fc993be2 parents 36d7d36 a51e3ac221 files · +2993 −1440Browse files

Showing the changes to include/uapi (1 of 221 files). Show all

Unified · Split

include/uapi/linux/if_ether.h+1−1
@@ -117,7 +117,7 @@ · 116 unmodified lines
117#define ETH_P_IFE 0xED3E /* ForCES inter-FE LFB type */117#define ETH_P_IFE 0xED3E /* ForCES inter-FE LFB type */
118#define ETH_P_AF_IUCV 0xFBFB /* IBM af_iucv [ NOT AN OFFICIALLY REGISTERED ID ] */118#define ETH_P_AF_IUCV 0xFBFB /* IBM af_iucv [ NOT AN OFFICIALLY REGISTERED ID ] */
119 119
120#define ETH_P_802_3_MIN 0x0600 /* If the value in the ethernet type is less than this value120#define ETH_P_802_3_MIN 0x0600 /* If the value in the ethernet type is more than this value
121 * then the frame is Ethernet II. Else it is 802.3 */121 * then the frame is Ethernet II. Else it is 802.3 */
122 122
123/*123/*

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