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

Commit 54948008 authored by Subash Abhinov Kasiviswanathan's avatar Subash Abhinov Kasiviswanathan
Browse files

msm_rmnet: merge support for RAWIP msm_rmnet device



Add to support for msm_rmnet device using ARPHRD_RAWIP.

CRs-Fixed: 1078373
Change-Id: Ie1e5433f440b26b644cccb18083ef325129f7942
Acked-by: default avatarAndrew Richardson <randrew@qualcomm.com>
Signed-off-by: default avatarSubash Abhinov Kasiviswanathan <subashab@codeaurora.org>
parent 80c888a1
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@
#define ARPHRD_LAPB	516		/* LAPB				*/
#define ARPHRD_DDCMP    517		/* Digital's DDCMP protocol     */
#define ARPHRD_RAWHDLC	518		/* Raw HDLC			*/
#define ARPHRD_RAWIP	530		/* Raw IP			*/

#define ARPHRD_TUNNEL	768		/* IPIP tunnel			*/
#define ARPHRD_TUNNEL6	769		/* IP6IP6 tunnel       		*/
+5 −1
Original line number Diff line number Diff line
@@ -2128,6 +2128,9 @@ static int ipv6_generate_eui64(u8 *eui, struct net_device *dev)
		return addrconf_ifid_ieee1394(eui, dev);
	case ARPHRD_TUNNEL6:
		return addrconf_ifid_ip6tnl(eui, dev);
	case ARPHRD_RAWIP:
		get_random_bytes(eui, 8);
		return 0;
	}
	return -1;
}
@@ -3227,7 +3230,8 @@ static void addrconf_dev_config(struct net_device *dev)
	    (dev->type != ARPHRD_IEEE1394) &&
	    (dev->type != ARPHRD_TUNNEL6) &&
	    (dev->type != ARPHRD_6LOWPAN) &&
	    (dev->type != ARPHRD_NONE)) {
	    (dev->type != ARPHRD_NONE) &&
	    (dev->type != ARPHRD_RAWIP)) {
		/* Alas, we support only Ethernet autoconfiguration. */
		return;
	}