Merge "net: qualcomm: rmnet: only set flags when given" (3654d89f) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -163,11 +163,11 @@ static int rmnet_newlink(struct net src_net, struct net_device dev,
		struct nlattr tb[], struct nlattr data[],
		struct netlink_ext_ack *extack)
		{
		u32 data_format = RMNET_FLAGS_INGRESS_DEAGGREGATION;
		struct net_device *real_dev;
		int mode = RMNET_EPMODE_VND;
		struct rmnet_endpoint *ep;
		struct rmnet_port *port;
		u32 data_format;
		int err = 0;
		u16 mux_id;

		@@ -202,10 +202,9 @@ static int rmnet_newlink(struct net src_net, struct net_device dev,

		flags = nla_data(data[IFLA_RMNET_FLAGS]);
		data_format = flags->flags & flags->mask;
		}

		netdev_dbg(dev, "data format [0x%08X]\n", data_format);
		port->data_format = data_format;
		}

		if (data[IFLA_RMNET_UL_AGG_PARAMS]) {
		void *agg_params;