Unconditionally set skb->dev in dp_set_origin.

If an invalid port index was used in dp_set_origin, the value of skb->dev
was left unchanged.  This change causes skb->dev to be set to NULL in those
circumstances.  This makes Packet Out and Add Flow messages that use a
buffer id behave like Packet Out without a buffer id.

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)

diff --git a/datapath/datapath.h b/datapath/datapath.h
index f5225e1bc5f7cf5ecb6671ad5abd606fd94177cf..10a42c0869fd31980da7a9918de4a9ebdbf7186b 100644 (file)
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -90,7 +90,7 @@ int dp_output_port(struct datapath *, struct sk_buff *, int out_port,
                   int ignore_no_fwd);
 int dp_output_control(struct datapath *, struct sk_buff *, uint32_t, 
                        size_t, int);
-int dp_set_origin(struct datapath *, uint16_t, struct sk_buff *);
+void dp_set_origin(struct datapath *, uint16_t, struct sk_buff *);
 int dp_send_features_reply(struct datapath *, const struct sender *);
 int dp_send_config_reply(struct datapath *, const struct sender *);
 int dp_send_port_status(struct net_bridge_port *p, uint8_t status);