diff --git a/[refs] b/[refs] index 8be9d1dc742f..922106950fda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25c7704d8bdcf6746dab4397953df51759924b37 +refs/heads/master: eaac5f3d3ad33547b299935e6db0cfc7be9a576a diff --git a/trunk/net/core/net-procfs.c b/trunk/net/core/net-procfs.c index 3174f1998ee6..569d355fec3e 100644 --- a/trunk/net/core/net-procfs.c +++ b/trunk/net/core/net-procfs.c @@ -271,7 +271,7 @@ static int ptype_seq_show(struct seq_file *seq, void *v) else seq_printf(seq, "%04x", ntohs(pt->type)); - seq_printf(seq, " %-8s %pF\n", + seq_printf(seq, " %-8s %pf\n", pt->dev ? pt->dev->name : "", pt->func); }