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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
net
/
hamradio
/
6pack.c
diff --git
a/drivers/net/hamradio/6pack.c
b/drivers/net/hamradio/6pack.c
index
d12605f
..
760d04a
100644
(file)
--- a/
drivers/net/hamradio/6pack.c
+++ b/
drivers/net/hamradio/6pack.c
@@
-12,7
+12,6
@@
* Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
*/
* Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <linux/module.h>
#include <asm/system.h>
#include <asm/uaccess.h>
@@
-326,11
+325,6
@@
static int sp_rebuild_header(struct sk_buff *skb)
static void sp_setup(struct net_device *dev)
{
static void sp_setup(struct net_device *dev)
{
- static char ax25_bcast[AX25_ADDR_LEN] =
- {'Q'<<1,'S'<<1,'T'<<1,' '<<1,' '<<1,' '<<1,'0'<<1};
- static char ax25_test[AX25_ADDR_LEN] =
- {'L'<<1,'I'<<1,'N'<<1,'U'<<1,'X'<<1,' '<<1,'1'<<1};
-
/* Finish setting up the DEVICE info. */
dev->mtu = SIXP_MTU;
dev->hard_start_xmit = sp_xmit;
/* Finish setting up the DEVICE info. */
dev->mtu = SIXP_MTU;
dev->hard_start_xmit = sp_xmit;
@@
-348,8
+342,8
@@
static void sp_setup(struct net_device *dev)
dev->tx_timeout = NULL;
/* Only activated in AX.25 mode */
dev->tx_timeout = NULL;
/* Only activated in AX.25 mode */
- memcpy(dev->broadcast, ax25_bcast, AX25_ADDR_LEN);
- memcpy(dev->dev_addr,
ax25_test
, AX25_ADDR_LEN);
+ memcpy(dev->broadcast,
&
ax25_bcast, AX25_ADDR_LEN);
+ memcpy(dev->dev_addr,
&ax25_defaddr
, AX25_ADDR_LEN);
SET_MODULE_OWNER(dev);
SET_MODULE_OWNER(dev);
@@
-915,7
+909,7
@@
static void decode_prio_command(struct sixpack *sp, unsigned char cmd)
printk(KERN_DEBUG "6pack: protocol violation\n");
else
sp->status = 0;
printk(KERN_DEBUG "6pack: protocol violation\n");
else
sp->status = 0;
- cmd &=
!
SIXP_RX_DCD_MASK;
+ cmd &=
~
SIXP_RX_DCD_MASK;
}
sp->status = cmd & SIXP_PRIO_DATA_MASK;
} else { /* output watchdog char if idle */
}
sp->status = cmd & SIXP_PRIO_DATA_MASK;
} else { /* output watchdog char if idle */