git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull misc-for-upstream into release branch
[pandora-kernel.git]
/
drivers
/
net
/
ibm_emac
/
ibm_emac_core.c
diff --git
a/drivers/net/ibm_emac/ibm_emac_core.c
b/drivers/net/ibm_emac/ibm_emac_core.c
index
944eea6
..
dd8ad87
100644
(file)
--- a/
drivers/net/ibm_emac/ibm_emac_core.c
+++ b/
drivers/net/ibm_emac/ibm_emac_core.c
@@
-21,7
+21,6
@@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/sched.h>
#include <linux/string.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
#include <linux/string.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
@@
-184,7
+183,7
@@
static const char emac_stats_keys[EMAC_ETHTOOL_STATS_COUNT][ETH_GSTRING_LEN] = {
"tx_errors"
};
"tx_errors"
};
-static irqreturn_t emac_irq(int irq, void *dev_instance
, struct pt_regs *regs
);
+static irqreturn_t emac_irq(int irq, void *dev_instance);
static void emac_clean_tx_ring(struct ocp_enet_private *dev);
static inline int emac_phy_supports_gige(int phy_mode)
static void emac_clean_tx_ring(struct ocp_enet_private *dev);
static inline int emac_phy_supports_gige(int phy_mode)
@@
-1036,7
+1035,7
@@
static inline u16 emac_tx_csum(struct ocp_enet_private *dev,
struct sk_buff *skb)
{
#if defined(CONFIG_IBM_EMAC_TAH)
struct sk_buff *skb)
{
#if defined(CONFIG_IBM_EMAC_TAH)
- if (skb->ip_summed == CHECKSUM_
HW
) {
+ if (skb->ip_summed == CHECKSUM_
PARTIAL
) {
++dev->stats.tx_packets_csum;
return EMAC_TX_CTRL_TAH_CSUM;
}
++dev->stats.tx_packets_csum;
return EMAC_TX_CTRL_TAH_CSUM;
}
@@
-1515,7
+1514,7
@@
static void emac_rxde(void *param)
}
/* Hard IRQ */
}
/* Hard IRQ */
-static irqreturn_t emac_irq(int irq, void *dev_instance
, struct pt_regs *regs
)
+static irqreturn_t emac_irq(int irq, void *dev_instance)
{
struct ocp_enet_private *dev = dev_instance;
struct emac_regs __iomem *p = dev->emacp;
{
struct ocp_enet_private *dev = dev_instance;
struct emac_regs __iomem *p = dev->emacp;