Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebf8cd53 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usbnet: allow mini-drivers to consume L2 headers"

parents ee74cee8 2e641b84

drivers/net/usb/usbnet.c

+4 −1
Original line number Diff line number Diff line
@@ -323,7 +323,10 @@ void usbnet_skb_return (struct usbnet *dev, struct sk_buff *skb) 
		return;

	}



	/* only update if unset to allow minidriver rx_fixup override */

	if (skb->protocol == 0)

		skb->protocol = eth_type_trans(skb, dev->net);



	dev->net->stats.rx_packets++;

	dev->net->stats.rx_bytes += skb->len;

include/linux/socket.h

+3 −1
Original line number Diff line number Diff line
@@ -200,7 +200,8 @@ struct ucred { 
#define AF_ALG		38	/* Algorithm sockets		*/

#define AF_NFC		39	/* NFC sockets			*/

#define AF_VSOCK	40	/* vSockets			*/

#define AF_MAX		41	/* For now.. */

#define AF_QIPCRTR	42	/* QTI IPC Router		*/

#define AF_MAX		43	/* For now.. */



/* Protocol families, same as address families. */

#define PF_UNSPEC	AF_UNSPEC
@@ -246,6 +247,7 @@ struct ucred { 
#define PF_ALG		AF_ALG

#define PF_NFC		AF_NFC

#define PF_VSOCK	AF_VSOCK

#define PF_QIPCRTR	AF_QIPCRTR

#define PF_MAX		AF_MAX



/* Maximum queue length specifiable by listen.  */