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

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

Merge "net: qualcomm: rmnet: Process packets over ethernet"

parents 7459ed30 651d6edd
Loading
Loading
Loading
Loading
+10 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@


#include <linux/netdevice.h>
#include <linux/netdevice.h>
#include <linux/netdev_features.h>
#include <linux/netdev_features.h>
#include <linux/if_arp.h>
#include "rmnet_private.h"
#include "rmnet_private.h"
#include "rmnet_config.h"
#include "rmnet_config.h"
#include "rmnet_vnd.h"
#include "rmnet_vnd.h"
@@ -104,6 +105,15 @@ rmnet_map_ingress_handler(struct sk_buff *skb,
{
{
	struct sk_buff *skbn;
	struct sk_buff *skbn;


	if (skb->dev->type == ARPHRD_ETHER) {
		if (pskb_expand_head(skb, ETH_HLEN, 0, GFP_KERNEL)) {
			kfree_skb(skb);
			return;
		}

		skb_push(skb, ETH_HLEN);
	}

	if (port->ingress_data_format & RMNET_INGRESS_FORMAT_DEAGGREGATION) {
	if (port->ingress_data_format & RMNET_INGRESS_FORMAT_DEAGGREGATION) {
		while ((skbn = rmnet_map_deaggregate(skb)) != NULL)
		while ((skbn = rmnet_map_deaggregate(skb)) != NULL)
			__rmnet_map_ingress_handler(skbn, port);
			__rmnet_map_ingress_handler(skbn, port);