Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[karo-tx-linux.git] / drivers / net / macsec.c

diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index f83cf6696820cca338b02c4bfa49479a1108fa68..ff0a5ed3ca803551a0350303af44976d0f47dcfc 100644 (file)
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -879,6 +879,9 @@ static void macsec_decrypt_done(struct crypto_async_request *base, int err)
 
        aead_request_free(macsec_skb_cb(skb)->req);
 
+       if (!err)
+               macsec_skb_cb(skb)->valid = true;
+
        rcu_read_lock_bh();
        pn = ntohl(macsec_ethhdr(skb)->packet_number);
        if (!macsec_post_decrypt(skb, &macsec->secy, pn)) {
@@ -2888,13 +2891,13 @@ static int macsec_change_mtu(struct net_device *dev, int new_mtu)
        return 0;
 }
 
-static struct rtnl_link_stats64 *macsec_get_stats64(struct net_device *dev,
-                                                   struct rtnl_link_stats64 *s)
+static void macsec_get_stats64(struct net_device *dev,
+                              struct rtnl_link_stats64 *s)
 {
        int cpu;
 
        if (!dev->tstats)
-               return s;
+               return;
 
        for_each_possible_cpu(cpu) {
                struct pcpu_sw_netstats *stats;
@@ -2918,8 +2921,6 @@ static struct rtnl_link_stats64 *macsec_get_stats64(struct net_device *dev,
 
        s->rx_dropped = dev->stats.rx_dropped;
        s->tx_dropped = dev->stats.tx_dropped;
-
-       return s;
 }
 
 static int macsec_get_iflink(const struct net_device *dev)