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
/
appletalk
/
ipddp.c
diff --git
a/drivers/net/appletalk/ipddp.c
b/drivers/net/appletalk/ipddp.c
index
8c0a962
..
f22e46d
100644
(file)
--- a/
drivers/net/appletalk/ipddp.c
+++ b/
drivers/net/appletalk/ipddp.c
@@
-23,7
+23,6
@@
* of the GNU General Public License, incorporated herein by reference.
*/
* of the GNU General Public License, incorporated herein by reference.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
@@
-146,9
+145,7
@@
static int ipddp_xmit(struct sk_buff *skb, struct net_device *dev)
/* Create the Extended DDP header */
ddp = (struct ddpehdr *)skb->data;
/* Create the Extended DDP header */
ddp = (struct ddpehdr *)skb->data;
- ddp->deh_len = skb->len;
- ddp->deh_hops = 1;
- ddp->deh_pad = 0;
+ ddp->deh_len_hops = htons(skb->len + (1<<10));
ddp->deh_sum = 0;
/*
ddp->deh_sum = 0;
/*
@@
-171,7
+168,6
@@
static int ipddp_xmit(struct sk_buff *skb, struct net_device *dev)
ddp->deh_sport = 72;
*((__u8 *)(ddp+1)) = 22; /* ddp type = IP */
ddp->deh_sport = 72;
*((__u8 *)(ddp+1)) = 22; /* ddp type = IP */
- *((__u16 *)ddp)=ntohs(*((__u16 *)ddp)); /* fix up length field */
skb->protocol = htons(ETH_P_ATALK); /* Protocol has changed */
skb->protocol = htons(ETH_P_ATALK); /* Protocol has changed */
@@
-190,7
+186,7
@@
static int ipddp_xmit(struct sk_buff *skb, struct net_device *dev)
*/
static int ipddp_create(struct ipddp_route *new_rt)
{
*/
static int ipddp_create(struct ipddp_route *new_rt)
{
- struct ipddp_route *rt =
(struct ipddp_route*)
kmalloc(sizeof(*rt), GFP_KERNEL);
+ struct ipddp_route *rt = kmalloc(sizeof(*rt), GFP_KERNEL);
if (rt == NULL)
return -ENOMEM;
if (rt == NULL)
return -ENOMEM;
@@
-259,7
+255,7
@@
static struct ipddp_route* ipddp_find_route(struct ipddp_route *rt)
static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
- struct ipddp_route
*rt = (struct ipddp_route *)
ifr->ifr_data;
+ struct ipddp_route
__user *rt =
ifr->ifr_data;
struct ipddp_route rcp;
if(!capable(CAP_NET_ADMIN))
struct ipddp_route rcp;
if(!capable(CAP_NET_ADMIN))
@@
-289,7
+285,7
@@
static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
static struct net_device *dev_ipddp;
MODULE_LICENSE("GPL");
static struct net_device *dev_ipddp;
MODULE_LICENSE("GPL");
-
MODULE_PARM(ipddp_mode, "i"
);
+
module_param(ipddp_mode, int, 0
);
static int __init ipddp_init_module(void)
{
static int __init ipddp_init_module(void)
{