Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 314279
b: refs/heads/master
c: 7f95e18
h: refs/heads/master
i:
  314277: a17616a
  314275: 717ebb4
  314271: 6e86f44
v: v3
  • Loading branch information
Eldad Zack authored and David S. Miller committed Jun 16, 2012
1 parent e7f453a commit 1a75d29
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aee289baaa02dd2ffa1189c1600d5572a10e0714
refs/heads/master: 7f95e1880e70bb351b992b01ef70ff083fc00d30
17 changes: 8 additions & 9 deletions trunk/include/net/dst.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ struct dst_entry {
#else
void *__pad1;
#endif
int (*input)(struct sk_buff*);
int (*output)(struct sk_buff*);
int (*input)(struct sk_buff *);
int (*output)(struct sk_buff *);

int flags;
#define DST_HOST 0x0001
Expand Down Expand Up @@ -241,7 +241,7 @@ dst_metric_locked(const struct dst_entry *dst, int metric)
return dst_metric(dst, RTAX_LOCK) & (1<<metric);
}

static inline void dst_hold(struct dst_entry * dst)
static inline void dst_hold(struct dst_entry *dst)
{
/*
* If your kernel compilation stops here, please check
Expand All @@ -264,8 +264,7 @@ static inline void dst_use_noref(struct dst_entry *dst, unsigned long time)
dst->lastuse = time;
}

static inline
struct dst_entry * dst_clone(struct dst_entry * dst)
static inline struct dst_entry *dst_clone(struct dst_entry *dst)
{
if (dst)
atomic_inc(&dst->__refcnt);
Expand Down Expand Up @@ -371,12 +370,12 @@ static inline struct dst_entry *skb_dst_pop(struct sk_buff *skb)
}

extern int dst_discard(struct sk_buff *skb);
extern void *dst_alloc(struct dst_ops * ops, struct net_device *dev,
extern void *dst_alloc(struct dst_ops *ops, struct net_device *dev,
int initial_ref, int initial_obsolete, int flags);
extern void __dst_free(struct dst_entry * dst);
extern struct dst_entry *dst_destroy(struct dst_entry * dst);
extern void __dst_free(struct dst_entry *dst);
extern struct dst_entry *dst_destroy(struct dst_entry *dst);

static inline void dst_free(struct dst_entry * dst)
static inline void dst_free(struct dst_entry *dst)
{
if (dst->obsolete > 1)
return;
Expand Down

0 comments on commit 1a75d29

Please sign in to comment.