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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
net
/
decnet
/
dn_dev.c
diff --git
a/net/decnet/dn_dev.c
b/net/decnet/dn_dev.c
index
a26ff9f
..
efbead8
100644
(file)
--- a/
net/decnet/dn_dev.c
+++ b/
net/decnet/dn_dev.c
@@
-64,11
+64,11
@@
extern struct neigh_table dn_neigh_table;
/*
* decnet_address is kept in network order.
*/
/*
* decnet_address is kept in network order.
*/
-
__le16
decnet_address = 0;
+
dn_address
decnet_address = 0;
static DEFINE_RWLOCK(dndev_lock);
static struct net_device *decnet_default_device;
static DEFINE_RWLOCK(dndev_lock);
static struct net_device *decnet_default_device;
-static
BLOCKING_NOTIFIER_HEAD(dnaddr_chain)
;
+static
struct notifier_block *dnaddr_chain
;
static struct dn_dev *dn_dev_create(struct net_device *dev, int *err);
static void dn_dev_delete(struct net_device *dev);
static struct dn_dev *dn_dev_create(struct net_device *dev, int *err);
static void dn_dev_delete(struct net_device *dev);
@@
-439,14
+439,14
@@
static void dn_dev_del_ifa(struct dn_dev *dn_db, struct dn_ifaddr **ifap, int de
*ifap = ifa1->ifa_next;
if (dn_db->dev->type == ARPHRD_ETHER) {
*ifap = ifa1->ifa_next;
if (dn_db->dev->type == ARPHRD_ETHER) {
- if (ifa1->ifa_local != dn_
eth2dn(dev->dev_addr
)) {
+ if (ifa1->ifa_local != dn_
htons(dn_eth2dn(dev->dev_addr)
)) {
dn_dn2eth(mac_addr, ifa1->ifa_local);
dev_mc_delete(dev, mac_addr, ETH_ALEN, 0);
}
}
rtmsg_ifa(RTM_DELADDR, ifa1);
dn_dn2eth(mac_addr, ifa1->ifa_local);
dev_mc_delete(dev, mac_addr, ETH_ALEN, 0);
}
}
rtmsg_ifa(RTM_DELADDR, ifa1);
-
blocking_
notifier_call_chain(&dnaddr_chain, NETDEV_DOWN, ifa1);
+ notifier_call_chain(&dnaddr_chain, NETDEV_DOWN, ifa1);
if (destroy) {
dn_dev_free_ifa(ifa1);
if (destroy) {
dn_dev_free_ifa(ifa1);
@@
-470,7
+470,7
@@
static int dn_dev_insert_ifa(struct dn_dev *dn_db, struct dn_ifaddr *ifa)
}
if (dev->type == ARPHRD_ETHER) {
}
if (dev->type == ARPHRD_ETHER) {
- if (ifa->ifa_local != dn_
eth2dn(dev->dev_addr
)) {
+ if (ifa->ifa_local != dn_
htons(dn_eth2dn(dev->dev_addr)
)) {
dn_dn2eth(mac_addr, ifa->ifa_local);
dev_mc_add(dev, mac_addr, ETH_ALEN, 0);
dev_mc_upload(dev);
dn_dn2eth(mac_addr, ifa->ifa_local);
dev_mc_add(dev, mac_addr, ETH_ALEN, 0);
dev_mc_upload(dev);
@@
-481,7
+481,7
@@
static int dn_dev_insert_ifa(struct dn_dev *dn_db, struct dn_ifaddr *ifa)
dn_db->ifa_list = ifa;
rtmsg_ifa(RTM_NEWADDR, ifa);
dn_db->ifa_list = ifa;
rtmsg_ifa(RTM_NEWADDR, ifa);
-
blocking_
notifier_call_chain(&dnaddr_chain, NETDEV_UP, ifa);
+ notifier_call_chain(&dnaddr_chain, NETDEV_UP, ifa);
return 0;
}
return 0;
}
@@
-561,7
+561,7
@@
int dn_dev_ioctl(unsigned int cmd, void __user *arg)
switch(cmd) {
case SIOCGIFADDR:
switch(cmd) {
case SIOCGIFADDR:
- *((
__le16
*)sdn->sdn_nodeaddr) = ifa->ifa_local;
+ *((
dn_address
*)sdn->sdn_nodeaddr) = ifa->ifa_local;
goto rarok;
case SIOCSIFADDR:
goto rarok;
case SIOCSIFADDR:
@@
-620,7
+620,7
@@
int dn_dev_set_default(struct net_device *dev, int force)
}
write_unlock(&dndev_lock);
if (old)
}
write_unlock(&dndev_lock);
if (old)
- dev_put(
old
);
+ dev_put(
dev
);
return rv;
}
return rv;
}
@@
-804,7
+804,7
@@
done:
return skb->len;
}
return skb->len;
}
-static int dn_dev_get_first(struct net_device *dev,
__le16
*addr)
+static int dn_dev_get_first(struct net_device *dev,
dn_address
*addr)
{
struct dn_dev *dn_db = (struct dn_dev *)dev->dn_ptr;
struct dn_ifaddr *ifa;
{
struct dn_dev *dn_db = (struct dn_dev *)dev->dn_ptr;
struct dn_ifaddr *ifa;
@@
-830,7
+830,7
@@
out:
* a sensible default. Eventually the routing code will take care of all the
* nasties for us I hope.
*/
* a sensible default. Eventually the routing code will take care of all the
* nasties for us I hope.
*/
-int dn_dev_bind_default(
__le16
*addr)
+int dn_dev_bind_default(
dn_address
*addr)
{
struct net_device *dev;
int rv;
{
struct net_device *dev;
int rv;
@@
-853,7
+853,7
@@
static void dn_send_endnode_hello(struct net_device *dev, struct dn_ifaddr *ifa)
{
struct endnode_hello_message *msg;
struct sk_buff *skb = NULL;
{
struct endnode_hello_message *msg;
struct sk_buff *skb = NULL;
-
__le16
*pktlen;
+
unsigned short int
*pktlen;
struct dn_dev *dn_db = (struct dn_dev *)dev->dn_ptr;
if ((skb = dn_alloc_skb(NULL, sizeof(*msg), GFP_ATOMIC)) == NULL)
struct dn_dev *dn_db = (struct dn_dev *)dev->dn_ptr;
if ((skb = dn_alloc_skb(NULL, sizeof(*msg), GFP_ATOMIC)) == NULL)
@@
-882,7
+882,7
@@
static void dn_send_endnode_hello(struct net_device *dev, struct dn_ifaddr *ifa)
msg->datalen = 0x02;
memset(msg->data, 0xAA, 2);
msg->datalen = 0x02;
memset(msg->data, 0xAA, 2);
- pktlen = (
__le16
*)skb_push(skb,2);
+ pktlen = (
unsigned short
*)skb_push(skb,2);
*pktlen = dn_htons(skb->len - 2);
skb->nh.raw = skb->data;
*pktlen = dn_htons(skb->len - 2);
skb->nh.raw = skb->data;
@@
-926,7
+926,7
@@
static void dn_send_router_hello(struct net_device *dev, struct dn_ifaddr *ifa)
size_t size;
unsigned char *ptr;
unsigned char *i1, *i2;
size_t size;
unsigned char *ptr;
unsigned char *i1, *i2;
-
__le16
*pktlen;
+
unsigned short
*pktlen;
char *src;
if (mtu2blksize(dev) < (26 + 7))
char *src;
if (mtu2blksize(dev) < (26 + 7))
@@
-955,11
+955,11
@@
static void dn_send_router_hello(struct net_device *dev, struct dn_ifaddr *ifa)
ptr += ETH_ALEN;
*ptr++ = dn_db->parms.forwarding == 1 ?
DN_RT_INFO_L1RT : DN_RT_INFO_L2RT;
ptr += ETH_ALEN;
*ptr++ = dn_db->parms.forwarding == 1 ?
DN_RT_INFO_L1RT : DN_RT_INFO_L2RT;
- *((
__le16
*)ptr) = dn_htons(mtu2blksize(dev));
+ *((
unsigned short
*)ptr) = dn_htons(mtu2blksize(dev));
ptr += 2;
*ptr++ = dn_db->parms.priority; /* Priority */
*ptr++ = 0; /* Area: Reserved */
ptr += 2;
*ptr++ = dn_db->parms.priority; /* Priority */
*ptr++ = 0; /* Area: Reserved */
- *((
__le16
*)ptr) = dn_htons((unsigned short)dn_db->parms.t3);
+ *((
unsigned short
*)ptr) = dn_htons((unsigned short)dn_db->parms.t3);
ptr += 2;
*ptr++ = 0; /* MPD: Reserved */
i1 = ptr++;
ptr += 2;
*ptr++ = 0; /* MPD: Reserved */
i1 = ptr++;
@@
-974,7
+974,7
@@
static void dn_send_router_hello(struct net_device *dev, struct dn_ifaddr *ifa)
skb_trim(skb, (27 + *i2));
skb_trim(skb, (27 + *i2));
- pktlen = (
__le16
*)skb_push(skb, 2);
+ pktlen = (
unsigned short
*)skb_push(skb, 2);
*pktlen = dn_htons(skb->len - 2);
skb->nh.raw = skb->data;
*pktlen = dn_htons(skb->len - 2);
skb->nh.raw = skb->data;
@@
-1016,7
+1016,7
@@
static void dn_send_ptp_hello(struct net_device *dev, struct dn_ifaddr *ifa)
ptr = skb_put(skb, 2 + 4 + tdlen);
*ptr++ = DN_RT_PKT_HELO;
ptr = skb_put(skb, 2 + 4 + tdlen);
*ptr++ = DN_RT_PKT_HELO;
- *((
__le16
*)ptr) = ifa->ifa_local;
+ *((
dn_address
*)ptr) = ifa->ifa_local;
ptr += 2;
*ptr++ = tdlen;
ptr += 2;
*ptr++ = tdlen;
@@
-1150,7
+1150,7
@@
struct dn_dev *dn_dev_create(struct net_device *dev, int *err)
void dn_dev_up(struct net_device *dev)
{
struct dn_ifaddr *ifa;
void dn_dev_up(struct net_device *dev)
{
struct dn_ifaddr *ifa;
-
__le16
addr = decnet_address;
+
dn_address
addr = decnet_address;
int maybe_default = 0;
struct dn_dev *dn_db = (struct dn_dev *)dev->dn_ptr;
int maybe_default = 0;
struct dn_dev *dn_db = (struct dn_dev *)dev->dn_ptr;
@@
-1173,7
+1173,7
@@
void dn_dev_up(struct net_device *dev)
if (dev->type == ARPHRD_ETHER) {
if (memcmp(dev->dev_addr, dn_hiord, 4) != 0)
return;
if (dev->type == ARPHRD_ETHER) {
if (memcmp(dev->dev_addr, dn_hiord, 4) != 0)
return;
- addr = dn_
eth2dn(dev->dev_addr
);
+ addr = dn_
htons(dn_eth2dn(dev->dev_addr)
);
maybe_default = 1;
}
maybe_default = 1;
}
@@
-1285,12
+1285,12
@@
void dn_dev_devices_on(void)
int register_dnaddr_notifier(struct notifier_block *nb)
{
int register_dnaddr_notifier(struct notifier_block *nb)
{
- return
blocking_
notifier_chain_register(&dnaddr_chain, nb);
+ return notifier_chain_register(&dnaddr_chain, nb);
}
int unregister_dnaddr_notifier(struct notifier_block *nb)
{
}
int unregister_dnaddr_notifier(struct notifier_block *nb)
{
- return
blocking_
notifier_chain_unregister(&dnaddr_chain, nb);
+ return notifier_chain_unregister(&dnaddr_chain, nb);
}
#ifdef CONFIG_PROC_FS
}
#ifdef CONFIG_PROC_FS
@@
-1385,8
+1385,8
@@
static int dn_dev_seq_show(struct seq_file *seq, void *v)
mtu2blksize(dev),
dn_db->parms.priority,
dn_db->parms.state, dn_db->parms.name,
mtu2blksize(dev),
dn_db->parms.priority,
dn_db->parms.state, dn_db->parms.name,
- dn_db->router ? dn_addr2asc(dn_ntohs(*(
__le16
*)dn_db->router->primary_key), router_buf) : "",
- dn_db->peer ? dn_addr2asc(dn_ntohs(*(
__le16
*)dn_db->peer->primary_key), peer_buf) : "");
+ dn_db->router ? dn_addr2asc(dn_ntohs(*(
dn_address
*)dn_db->router->primary_key), router_buf) : "",
+ dn_db->peer ? dn_addr2asc(dn_ntohs(*(
dn_address
*)dn_db->peer->primary_key), peer_buf) : "");
}
return 0;
}
}
return 0;
}