diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-02 09:43:39 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-02 09:43:39 +0200 |
| commit | b429f71bca5a4ddd914350a39572692e2ea211e0 (patch) | |
| tree | 50cee6fb7b114ad89c778de87bcb44972b7326f5 /drivers/net/ethernet/seeq/sgiseeq.c | |
| parent | ace8031099f91480799b5929b4cccf2dcacc5136 (diff) | |
| parent | 6fd98e775f24fd41520928d345f5db3ff52bb35d (diff) | |
| download | lwn-b429f71bca5a4ddd914350a39572692e2ea211e0.tar.gz lwn-b429f71bca5a4ddd914350a39572692e2ea211e0.zip | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/seeq/sgiseeq.c')
| -rw-r--r-- | drivers/net/ethernet/seeq/sgiseeq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/seeq/sgiseeq.c b/drivers/net/ethernet/seeq/sgiseeq.c index 573691bc3b71..70cce63a6081 100644 --- a/drivers/net/ethernet/seeq/sgiseeq.c +++ b/drivers/net/ethernet/seeq/sgiseeq.c @@ -578,7 +578,8 @@ static inline int sgiseeq_reset(struct net_device *dev) return 0; } -static int sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t +sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct sgiseeq_private *sp = netdev_priv(dev); struct hpc3_ethregs *hregs = sp->hregs; |