Merge commit 'origin/HEAD' into test-merge

Manual fixup of include/asm-powerpc/pgtable-ppc64.h

1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index ed24a1d607dd..61af02b4c9d8 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -1643,6 +1643,12 @@ static int emac_poll_rx(void *param, int budget)
                         goto next;
                 }
 
+                if (len < ETH_HLEN) {
+                        ++dev->estats.rx_dropped_stack;
+                        emac_recycle_rx_skb(dev, slot, len);
+                        goto next;
+                }
+
                 if (len && len < EMAC_RX_COPY_THRESH) {
                         struct sk_buff *copy_skb =
                             alloc_skb(len + EMAC_RX_SKB_HEADROOM + 2, GFP_ATOMIC);
@@ -2738,6 +2744,8 @@ static int __devinit emac_probe(struct of_device *ofdev,
         /* Clean rings */
         memset(dev->tx_desc, 0, NUM_TX_BUFF * sizeof(struct mal_descriptor));
         memset(dev->rx_desc, 0, NUM_RX_BUFF * sizeof(struct mal_descriptor));
+        memset(dev->tx_skb, 0, NUM_TX_BUFF * sizeof(struct sk_buff *));
+        memset(dev->rx_skb, 0, NUM_RX_BUFF * sizeof(struct sk_buff *));
 
         /* Attach to ZMII, if needed */
         if (emac_has_feature(dev, EMAC_FTR_HAS_ZMII) &&