net: qualcomm: rmnet: Remove the some redundant macros

Multiplexing is always enabled when transmiting from a rmnet device,
so remove the redundant egress macros. De-multiplexing is always
enabled when receiving packets from a rmnet device, so remove those
ingress macros.

Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c
index df21e900f874036bfaf349fa334acf6c339acf3c..46bb2282b4a6a2632cf395de6a73bfcdca825aa0 100644 (file)
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c
@@ -143,11 +143,7 @@ static int rmnet_newlink(struct net *src_net, struct net_device *dev,
                         struct nlattr *tb[], struct nlattr *data[],
                         struct netlink_ext_ack *extack)
 {
-       int ingress_format = RMNET_INGRESS_FORMAT_DEMUXING |
-                            RMNET_INGRESS_FORMAT_DEAGGREGATION |
-                            RMNET_INGRESS_FORMAT_MAP;
-       int egress_format = RMNET_EGRESS_FORMAT_MUXING |
-                           RMNET_EGRESS_FORMAT_MAP;
+       int ingress_format = RMNET_INGRESS_FORMAT_DEAGGREGATION;
        struct net_device *real_dev;
        int mode = RMNET_EPMODE_VND;
        struct rmnet_endpoint *ep;
@@ -181,9 +177,7 @@ static int rmnet_newlink(struct net *src_net, struct net_device *dev,
        if (err)
                goto err2;
 
-       netdev_dbg(dev, "data format [ingress 0x%08X] [egress 0x%08X]\n",
-                  ingress_format, egress_format);
-       port->egress_data_format = egress_format;
+       netdev_dbg(dev, "data format [ingress 0x%08X]\n", ingress_format);
        port->ingress_data_format = ingress_format;
        port->rmnet_mode = mode;
 

diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h
index c19259eea99e317a9881c27990c2e367dc7d6c1d..2ea9fe3265715a3f5c7456968e5eb640824c4fbe 100644 (file)
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h
@@ -33,7 +33,6 @@ struct rmnet_endpoint {
 struct rmnet_port {
        struct net_device *dev;
        u32 ingress_data_format;
-       u32 egress_data_format;
        u8 nr_rmnet_devs;
        u8 rmnet_mode;
        struct hlist_head muxed_ep[RMNET_MAX_LOGICAL_EP];

diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
index 1e1ea100f28c22e821f490ed766eaf0e5c2e672f..a46053ce6b241defa69c22c6fa3b15cd243b9d66 100644 (file)
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
@@ -133,12 +133,10 @@ static int rmnet_map_egress_handler(struct sk_buff *skb,
        if (!map_header)
                goto fail;
 
-       if (port->egress_data_format & RMNET_EGRESS_FORMAT_MUXING) {
-               if (mux_id == 0xff)
-                       map_header->mux_id = 0;
-               else
-                       map_header->mux_id = mux_id;
-       }
+       if (mux_id == 0xff)
+               map_header->mux_id = 0;
+       else
+               map_header->mux_id = mux_id;
 
        skb->protocol = htons(ETH_P_MAP);
 
@@ -178,8 +176,7 @@ rx_handler_result_t rmnet_rx_handler(struct sk_buff **pskb)
 
        switch (port->rmnet_mode) {
        case RMNET_EPMODE_VND:
-               if (port->ingress_data_format & RMNET_INGRESS_FORMAT_MAP)
-                       rmnet_map_ingress_handler(skb, port);
+               rmnet_map_ingress_handler(skb, port);
                break;
        case RMNET_EPMODE_BRIDGE:
                rmnet_bridge_handler(skb, port->bridge_ep);
@@ -212,10 +209,8 @@ void rmnet_egress_handler(struct sk_buff *skb)
                return;
        }
 
-       if (port->egress_data_format & RMNET_EGRESS_FORMAT_MAP) {
-               if (rmnet_map_egress_handler(skb, port, mux_id, orig_dev))
-                       return;
-       }
+       if (rmnet_map_egress_handler(skb, port, mux_id, orig_dev))
+               return;
 
        rmnet_vnd_tx_fixup(skb, orig_dev);
 

diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_private.h b/drivers/net/ethernet/qualcomm/rmnet/rmnet_private.h
index 49102f922b311fc3dc116e453182c15c9cc4db84..d21428078504a0280e4a9ea1aad56e868e642284 100644 (file)
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_private.h
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_private.h
@@ -19,14 +19,8 @@
 #define RMNET_TX_QUEUE_LEN         1000
 
 /* Constants */
-#define RMNET_EGRESS_FORMAT_MAP                 BIT(1)
-#define RMNET_EGRESS_FORMAT_AGGREGATION         BIT(2)
-#define RMNET_EGRESS_FORMAT_MUXING              BIT(3)
-
-#define RMNET_INGRESS_FORMAT_MAP                BIT(1)
-#define RMNET_INGRESS_FORMAT_DEAGGREGATION      BIT(2)
-#define RMNET_INGRESS_FORMAT_DEMUXING           BIT(3)
-#define RMNET_INGRESS_FORMAT_MAP_COMMANDS       BIT(4)
+#define RMNET_INGRESS_FORMAT_DEAGGREGATION      BIT(0)
+#define RMNET_INGRESS_FORMAT_MAP_COMMANDS       BIT(1)
 
 /* Replace skb->dev to a virtual rmnet device and pass up the stack */
 #define RMNET_EPMODE_VND (1)