datapath: Remove ODPP_NORMAL macro.

[openvswitch] / datapath / flow.h

diff --git a/datapath/flow.h b/datapath/flow.h
index 808e731fc9d85cc04a3aac70f96ab3a20e81e4f0..076448272b9c2dc1178bab4958704eea671cc56c 100644 (file)
--- a/datapath/flow.h
+++ b/datapath/flow.h
@@ -34,7 +34,7 @@ struct sw_flow {
        struct tbl_node tbl_node;
 
        struct odp_flow_key key;
-       struct sw_flow_actions *sf_acts;
+       struct sw_flow_actions __rcu *sf_acts;
 
        atomic_t refcnt;
        bool dead;
@@ -59,7 +59,7 @@ struct arp_eth_header
        unsigned char       ar_sip[4];          /* sender IP address        */
        unsigned char       ar_tha[ETH_ALEN];   /* target hardware address  */
        unsigned char       ar_tip[4];          /* target IP address        */
-} __attribute__((packed));
+} __packed;
 
 int flow_init(void);
 void flow_exit(void);