datapath: Fix coding style issues.

[sliver-openvswitch.git] / datapath / vport.c

diff --git a/datapath/vport.c b/datapath/vport.c
index 8826e75..31edc58 100644 (file)
--- a/datapath/vport.c
+++ b/datapath/vport.c
@@ -159,7 +159,8 @@ static struct kobj_type brport_ktype = {
  * vport_priv().  vports that are no longer needed should be released with
  * vport_free().
  */
-struct vport *vport_alloc(int priv_size, const struct vport_ops *ops, const struct vport_parms *parms)
+struct vport *vport_alloc(int priv_size, const struct vport_ops *ops,
+                         const struct vport_parms *parms)
 {
        struct vport *vport;
        size_t alloc_size;
@@ -563,7 +564,6 @@ void vport_receive(struct vport *vport, struct sk_buff *skb)
 {
        struct vport_percpu_stats *stats;
 
-       local_bh_disable();
        stats = per_cpu_ptr(vport->percpu_stats, smp_processor_id());
 
        write_seqcount_begin(&stats->seqlock);
@@ -571,8 +571,6 @@ void vport_receive(struct vport *vport, struct sk_buff *skb)
        stats->rx_bytes += skb->len;
        write_seqcount_end(&stats->seqlock);
 
-       local_bh_enable();
-
        if (!(vport->ops->flags & VPORT_F_FLOW))
                OVS_CB(skb)->flow = NULL;
 
@@ -596,7 +594,6 @@ int vport_send(struct vport *vport, struct sk_buff *skb)
        struct vport_percpu_stats *stats;
        int sent = vport->ops->send(vport, skb);
 
-       local_bh_disable();
        stats = per_cpu_ptr(vport->percpu_stats, smp_processor_id());
 
        write_seqcount_begin(&stats->seqlock);
@@ -604,8 +601,6 @@ int vport_send(struct vport *vport, struct sk_buff *skb)
        stats->tx_bytes += sent;
        write_seqcount_end(&stats->seqlock);
 
-       local_bh_enable();
-
        return sent;
 }
 
@@ -620,7 +615,7 @@ int vport_send(struct vport *vport, struct sk_buff *skb)
  */
 void vport_record_error(struct vport *vport, enum vport_err_type err_type)
 {
-       spin_lock_bh(&vport->stats_lock);
+       spin_lock(&vport->stats_lock);
 
        switch (err_type) {
        case VPORT_E_RX_DROPPED:
@@ -640,5 +635,5 @@ void vport_record_error(struct vport *vport, enum vport_err_type err_type)
                break;
        };
 
-       spin_unlock_bh(&vport->stats_lock);
+       spin_unlock(&vport->stats_lock);
 }