From 1672d7da0d865128dcede5eaced9eab4794f8bb5 Mon Sep 17 00:00:00 2001 From: Denis Kirjanov Date: Mon, 31 May 2010 00:24:49 +0000 Subject: [PATCH] --- yaml --- r: 199477 b: refs/heads/master c: 5ed83663f77ee7404022d046321f69545cd311b8 h: refs/heads/master i: 199475: eb50a1da3ed361d70446618d90208e6f99d7a310 v: v3 --- [refs] | 2 +- trunk/drivers/net/ksz884x.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6c7d2fb5d01c..27b7b5bf5c9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa989f5e46bb913e1a5966bb7d32eb2d00c1894e +refs/heads/master: 5ed83663f77ee7404022d046321f69545cd311b8 diff --git a/trunk/drivers/net/ksz884x.c b/trunk/drivers/net/ksz884x.c index c80ca64277b2..4568b6f163eb 100644 --- a/trunk/drivers/net/ksz884x.c +++ b/trunk/drivers/net/ksz884x.c @@ -4854,7 +4854,7 @@ static inline void copy_old_skb(struct sk_buff *old, struct sk_buff *skb) * * Return 0 if successful; otherwise an error code indicating failure. */ -static int netdev_tx(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t netdev_tx(struct sk_buff *skb, struct net_device *dev) { struct dev_priv *priv = netdev_priv(dev); struct dev_info *hw_priv = priv->adapter;