git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
net
/
atm
/
mpc.c
diff --git
a/net/atm/mpc.c
b/net/atm/mpc.c
index
17a81eb
..
c304ef1
100644
(file)
--- a/
net/atm/mpc.c
+++ b/
net/atm/mpc.c
@@
-3,6
+3,7
@@
#include <linux/timer.h>
#include <linux/init.h>
#include <linux/bitops.h>
#include <linux/timer.h>
#include <linux/init.h>
#include <linux/bitops.h>
+#include <linux/capability.h>
#include <linux/seq_file.h>
/* We are an ethernet device */
#include <linux/seq_file.h>
/* We are an ethernet device */
@@
-105,7
+106,7
@@
extern void mpc_proc_clean(void);
struct mpoa_client *mpcs = NULL; /* FIXME */
static struct atm_mpoa_qos *qos_head = NULL;
struct mpoa_client *mpcs = NULL; /* FIXME */
static struct atm_mpoa_qos *qos_head = NULL;
-static
struct timer_list mpc_timer = TIMER_INITIALIZER(
NULL, 0, 0);
+static
DEFINE_TIMER(mpc_timer,
NULL, 0, 0);
static struct mpoa_client *find_mpc_by_itfnum(int itf)
static struct mpoa_client *find_mpc_by_itfnum(int itf)
@@
-552,7
+553,7
@@
static int mpc_send_packet(struct sk_buff *skb, struct net_device *dev)
goto non_ip; /* Multi-Protocol Over ATM :-) */
while (i < mpc->number_of_mps_macs) {
goto non_ip; /* Multi-Protocol Over ATM :-) */
while (i < mpc->number_of_mps_macs) {
- if (
memcmp(eth->h_dest, (mpc->mps_macs + i*ETH_ALEN), ETH_ALEN) == 0
)
+ if (
!compare_ether_addr(eth->h_dest, (mpc->mps_macs + i*ETH_ALEN))
)
if ( send_via_shortcut(skb, mpc) == 0 ) /* try shortcut */
return 0; /* success! */
i++;
if ( send_via_shortcut(skb, mpc) == 0 ) /* try shortcut */
return 0; /* success! */
i++;