Unconditionally set skb->dev in dp_set_origin.

[openvswitch] / datapath / datapath.c

diff --git a/datapath/datapath.c b/datapath/datapath.c
index d84240bc24795110109dbc14f9de3197cbecc5cb..3fa8cdc0af51cd9dc4a932ff728a595fba8b784d 100644 (file)
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -533,17 +533,16 @@ output_all(struct datapath *dp, struct sk_buff *skb, int flood)
 
 /* Marks 'skb' as having originated from 'in_port' in 'dp'.
    FIXME: how are devices reference counted? */
-int dp_set_origin(struct datapath *dp, uint16_t in_port,
+void dp_set_origin(struct datapath *dp, uint16_t in_port,
                           struct sk_buff *skb)
 {
        struct net_bridge_port *p = (in_port < OFPP_MAX ? dp->ports[in_port]
                                     : in_port == OFPP_LOCAL ? dp->local_port
                                     : NULL);
-       if (p) {
+       if (p) 
                skb->dev = p->dev;
-               return 0;
-       }
-       return -ENOENT;
+        else 
+               skb->dev = NULL;
 }
 
 static int xmit_skb(struct sk_buff *skb)