aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/ulp/ipoib/ipoib_main.c
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2007-10-23 22:57:54 -0400
committerRoland Dreier <rolandd@cisco.com>2008-01-25 17:15:23 -0500
commit2337f80941ac22f747ce6fd2c7a79e91d911a3ce (patch)
treee813aa78a5ec8fc07bad4826ac083ac83ae35f5c /drivers/infiniband/ulp/ipoib/ipoib_main.c
parent657c2f2cbccbac88689ac5174fc13dd3f9aece34 (diff)
IPoIB: Trivial formatting cleanups
Fix whitespace blunders, convert "foo* bar" to "foo *bar", etc. Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib_main.c')
-rw-r--r--drivers/infiniband/ulp/ipoib/ipoib_main.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index c9f6077b615e..5a9c3b5a39ef 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -474,8 +474,8 @@ static struct ipoib_path *path_rec_create(struct net_device *dev, void *gid)
474 INIT_LIST_HEAD(&path->neigh_list); 474 INIT_LIST_HEAD(&path->neigh_list);
475 475
476 memcpy(path->pathrec.dgid.raw, gid, sizeof (union ib_gid)); 476 memcpy(path->pathrec.dgid.raw, gid, sizeof (union ib_gid));
477 path->pathrec.sgid = priv->local_gid; 477 path->pathrec.sgid = priv->local_gid;
478 path->pathrec.pkey = cpu_to_be16(priv->pkey); 478 path->pathrec.pkey = cpu_to_be16(priv->pkey);
479 path->pathrec.numb_path = 1; 479 path->pathrec.numb_path = 1;
480 path->pathrec.traffic_class = priv->broadcast->mcmember.traffic_class; 480 path->pathrec.traffic_class = priv->broadcast->mcmember.traffic_class;
481 481
@@ -950,34 +950,34 @@ static void ipoib_setup(struct net_device *dev)
950{ 950{
951 struct ipoib_dev_priv *priv = netdev_priv(dev); 951 struct ipoib_dev_priv *priv = netdev_priv(dev);
952 952
953 dev->open = ipoib_open; 953 dev->open = ipoib_open;
954 dev->stop = ipoib_stop; 954 dev->stop = ipoib_stop;
955 dev->change_mtu = ipoib_change_mtu; 955 dev->change_mtu = ipoib_change_mtu;
956 dev->hard_start_xmit = ipoib_start_xmit; 956 dev->hard_start_xmit = ipoib_start_xmit;
957 dev->tx_timeout = ipoib_timeout; 957 dev->tx_timeout = ipoib_timeout;
958 dev->header_ops = &ipoib_header_ops; 958 dev->header_ops = &ipoib_header_ops;
959 dev->set_multicast_list = ipoib_set_mcast_list; 959 dev->set_multicast_list = ipoib_set_mcast_list;
960 dev->neigh_setup = ipoib_neigh_setup_dev; 960 dev->neigh_setup = ipoib_neigh_setup_dev;
961 961
962 netif_napi_add(dev, &priv->napi, ipoib_poll, 100); 962 netif_napi_add(dev, &priv->napi, ipoib_poll, 100);
963 963
964 dev->watchdog_timeo = HZ; 964 dev->watchdog_timeo = HZ;
965 965
966 dev->flags |= IFF_BROADCAST | IFF_MULTICAST; 966 dev->flags |= IFF_BROADCAST | IFF_MULTICAST;
967 967
968 /* 968 /*
969 * We add in INFINIBAND_ALEN to allow for the destination 969 * We add in INFINIBAND_ALEN to allow for the destination
970 * address "pseudoheader" for skbs without neighbour struct. 970 * address "pseudoheader" for skbs without neighbour struct.
971 */ 971 */
972 dev->hard_header_len = IPOIB_ENCAP_LEN + INFINIBAND_ALEN; 972 dev->hard_header_len = IPOIB_ENCAP_LEN + INFINIBAND_ALEN;
973 dev->addr_len = INFINIBAND_ALEN; 973 dev->addr_len = INFINIBAND_ALEN;
974 dev->type = ARPHRD_INFINIBAND; 974 dev->type = ARPHRD_INFINIBAND;
975 dev->tx_queue_len = ipoib_sendq_size * 2; 975 dev->tx_queue_len = ipoib_sendq_size * 2;
976 dev->features = NETIF_F_VLAN_CHALLENGED | NETIF_F_LLTX; 976 dev->features = NETIF_F_VLAN_CHALLENGED | NETIF_F_LLTX;
977 977
978 /* MTU will be reset when mcast join happens */ 978 /* MTU will be reset when mcast join happens */
979 dev->mtu = IPOIB_PACKET_SIZE - IPOIB_ENCAP_LEN; 979 dev->mtu = IPOIB_PACKET_SIZE - IPOIB_ENCAP_LEN;
980 priv->mcast_mtu = priv->admin_mtu = dev->mtu; 980 priv->mcast_mtu = priv->admin_mtu = dev->mtu;
981 981
982 memcpy(dev->broadcast, ipv4_bcast_addr, INFINIBAND_ALEN); 982 memcpy(dev->broadcast, ipv4_bcast_addr, INFINIBAND_ALEN);
983 983